From 943e21ffe72a21d6c643d9a69846b4e84f2a850d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 22 四月 2024 17:27:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 87 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs | 26
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 5
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 15
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_ICStockBackBillList.aspx.cs | 17
WebTM/views/领料发货/销售出库/Kf_SellOutBillList_BarCodeNote.html | 16
WebTM/views/基础资料/公用基础资料/Gy_SellStyle.html | 10
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList_New.html | 4
WebTM/views/index_QiaoYi.html | 226 ++--
WebTM/views/车间管理/报表分析/SemiFinishedProductsReport.html | 88 +
WebTM/views/销售管理/信用额度申请单/Xs_CusRatingChangeBill.html | 14
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 20
WebTM/views/销售管理/销售退货单/Kf_ICStockBackBillList.html | 42
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 6
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 3
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx | 28
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 9
WebTM/views/应收管理/报表分析/Kf_SellOutEntryReport.html | 79 +
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html | 162 +-
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 101 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 9
WebTM/views/基础资料/公用基础资料/Gy_OrderLev.html | 11
WebTM/views/销售管理/销售退货单/Kf_ICStockBackBill.html | 111 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_ICStockBackBillList.aspx | 28
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs | 17
WebTM/views/grf/销售退货单测试1.grf | 1176 +++++++++++++++++++++++++
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 129 ++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Mul.html | 8
WebTM/views/销售管理/应收退款单/YS_ReceiveBackBill.html | 10
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBill.html | 30
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 89 +
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 170 +-
WebTM/WebTM.csproj | 17
35 files changed, 2,389 insertions(+), 404 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index ac44a00..98290be 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1487,6 +1487,9 @@
<File Include="views/grf/閿�鍞��璐у崟.grf">
<publishTime>12/08/2023 08:34:49</publishTime>
</File>
+ <File Include="views/grf/閿�鍞��璐у崟娴嬭瘯1.grf">
+ <publishTime>04/15/2024 08:51:11</publishTime>
+ </File>
<File Include="views/GRInstall.js">
<publishTime>12/08/2023 08:34:49</publishTime>
</File>
@@ -2195,6 +2198,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_BadPhenomena.html">
<publishTime>04/10/2024 08:51:26</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_BadPhenomena.html">
+ <publishTime>04/09/2024 10:58:17</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html">
<publishTime>04/10/2024 08:51:26</publishTime>
</File>
@@ -2359,6 +2365,9 @@
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html">
<publishTime>04/10/2024 08:51:26</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html">
+ <publishTime>04/09/2024 10:58:17</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
<publishTime>03/28/2024 10:02:07</publishTime>
@@ -2714,6 +2723,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_ICStockBill.aspx">
<publishTime>12/08/2023 08:34:50</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_ICStockBackBillList.aspx">
+ <publishTime>04/15/2024 09:00:50</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_MateOutBillList.aspx">
<publishTime>12/08/2023 08:34:50</publishTime>
</File>
@@ -2726,6 +2738,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx">
<publishTime>02/28/2024 14:24:50</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx">
+ <publishTime>04/10/2024 16:35:32</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldDotCheckBill.aspx">
<publishTime>12/08/2023 08:34:50</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 53cf985..f04f17e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -340,6 +340,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardAddress.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardType.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx" />
@@ -799,6 +801,7 @@
<Content Include="views\grf\鍏朵粬搴旀敹鍗�.grf" />
<Content Include="views\grf\閿�鍞皟浠峰崟涓嶅惈绋�.grf" />
<Content Include="views\grf\閿�鍞皟浠峰崟鍚◣锛堜粎闄愬惈绋庢墦鍗帮級.grf" />
+ <Content Include="views\grf\閿�鍞��璐у崟娴嬭瘯1.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1947,6 +1950,20 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx.designer.cs">
<DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs">
+ <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
<DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index fd98315..161356c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,9 +5,9 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/grf/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225\346\265\213\350\257\2251.grf" "b/WebTM/views/grf/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225\346\265\213\350\257\2251.grf"
new file mode 100644
index 0000000..6bf372b
--- /dev/null
+++ "b/WebTM/views/grf/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225\346\265\213\350\257\2251.grf"
@@ -0,0 +1,1176 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=24
+ Height=14
+ LeftMargin=1
+ TopMargin=0
+ RightMargin=0
+ BottomMargin=0.5
+ PrintOffsetY=0.3
+ End
+ Object DetailGrid
+ AppendBlankRow=T
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='瀹㈡埛'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy骞碝M鏈坉d鏃�'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='浠舵暟'
+ Type=Integer
+ End
+ Item
+ Name='瀹炲彂鏁伴噺'
+ Type=Float
+ Format='0.##'
+ End
+ Item
+ Name='鍚◣鍗曚环'
+ Type=Currency
+ Format='0.##'
+ End
+ Item
+ Name='浠风◣鍚堣'
+ Type=Currency
+ Format='0.##'
+ 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
+ Item
+ Name='閿�鍞粍缁�'
+ End
+ Item
+ Name='鍗曟嵁鐘舵��'
+ End
+ Item
+ Name='鏈崟閲戦'
+ End
+ Item
+ Name='淇＄敤宸'
+ End
+ Item
+ Name='鍒跺崟浜�'
+ End
+ Item
+ Name='瀹℃牳浜�'
+ End
+ Item
+ Name='绋庣巼'
+ Type=Integer
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column1'
+ Width=1
+ End
+ Item
+ Name='Column11'
+ Width=3.0279
+ End
+ Item
+ Name='Column4'
+ Width=3.20146
+ FixedWidth=T
+ End
+ Item
+ Name='Column5'
+ Width=2.72521
+ FixedWidth=T
+ End
+ Item
+ Name='Column7'
+ Width=0.93
+ FixedWidth=T
+ End
+ Item
+ Name='Column13'
+ Width=1.7
+ End
+ Item
+ Name='Column8'
+ Width=2
+ FixedWidth=T
+ End
+ Item
+ Name='Column12'
+ Width=1.1
+ End
+ Item
+ Name='Column9'
+ Width=2
+ FixedWidth=T
+ End
+ Item
+ Name='Column10'
+ Width=1.8902
+ End
+ End
+ Object ColumnContent
+ Height=0.7937
+ AdjustRowHeight=F
+ RowsPerPage=9
+ Items ColumnContentCell
+ Item
+ Column='Column1'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ SystemVar=RowNo
+ End
+ End
+ BorderCustom=T
+ End
+ Item
+ Column='Column11'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐗╂枡浠ｇ爜'
+ BorderCustom=T
+ End
+ Item
+ Column='Column4'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='鐗╂枡鍚嶇О'
+ BorderCustom=T
+ End
+ Item
+ Column='Column5'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='瑙勬牸鍨嬪彿'
+ BorderCustom=T
+ End
+ Item
+ Column='Column7'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='浠舵暟'
+ BorderCustom=T
+ End
+ Item
+ Column='Column13'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ DataField='瀹炲彂鏁伴噺'
+ BorderCustom=T
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='鍚◣鍗曚环'
+ BorderCustom=T
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ DataField='绋庣巼'
+ BorderCustom=T
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='浠风◣鍚堣'
+ BorderCustom=T
+ End
+ Item
+ Column='Column10'
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ DataField='琛ㄤ綋澶囨敞'
+ BorderCustom=T
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.00542
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='搴忓彿'
+ End
+ Item
+ GroupTitle=F
+ Column='Column11'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鎵瑰彿'
+ End
+ Item
+ GroupTitle=F
+ Column='Column4'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='棰滆壊'
+ End
+ Item
+ GroupTitle=F
+ Column='Column5'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瑙勬牸'
+ End
+ Item
+ GroupTitle=F
+ Column='Column7'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='浠舵暟'
+ End
+ Item
+ GroupTitle=F
+ Column='Column13'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='绫虫暟'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鍚◣鍗曚环'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='绋庣巼'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='浠风◣鍚堣'
+ End
+ Item
+ GroupTitle=F
+ Column='Column10'
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ BorderCustom=T
+ End
+ End
+ End
+ End
+ Items Parameter
+ Item
+ Name='Parameter1'
+ End
+ Item
+ Name='Parameter2'
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=2.80458
+ Items Control
+ Item
+ Type=StaticBox
+ Name='StaticBox2'
+ Left=4.78896
+ Width=12.8058
+ Height=1.40229
+ Object Font
+ Name='妤蜂綋'
+ Size=202500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹佹尝绉戣壓缁胯壊鐨崏闆嗗洟鏈夐檺鍏徃'
+ End
+ Item
+ Type=PictureBox
+ Name='PictureBox2'
+ Left=0.211667
+ Width=3.99521
+ Height=2.19604
+ Picture=-31899
+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
+3q7siNWeKPMFj9Nt41qQtZfcSMSvMTxdmqB6pfbo3P4HTJ6wRK1VceTwOdy+rfORur2EgyNSKvhx1TuraUiYXYQ1rRl3QraJ20LMtmg1u1O1S+dMNQtUrs/OQz7Do4dG
+iPMCRojzEDQGrhG78o8NCAv6TgRADIKdHJYQV/RvLcZ4QoxHvGEx2uzQQtw2RyEu0LCEePOGXfARo1arjLGTR4ybIujhEiqi2xJfftEdN+/cx4MnT7Fg0V8I37IbfXtP
+xPffzcDg/rMQ1PBbiSvrPGGbVsOtZoh0nLt4Ha1bDldxyvUQdu85pcZOv1AgKSFOx9nTl1C6RJglaLrqr0THLRQ+HiG5JI8NkwKEBYPdfCDPIxwz+mfl+dv3pyByxbjP
+a3HEixZWzsjz82yBenW+VtOd2e7P56OQa/Hl1OkQVC3fBj+IB3/k8HlEhO/B111HoVTJpsqTd/ZElZcqNSt2oNF7/WXu8ixCnJaWjCOHTuHA/mPCE4r7X8rj2BZ9WPKY
+hMMqCPy8ghC5dS8OHJDzD8j5r+JBvU1OSVb3N3g3GCHOS4gxUGTXr9uKymVb6uFQqiobguYhQ3Hhwg1lOMp4s+kHYXvEaiUuETQfj2ZqEfXCIsSPHz8Vr20gBvWfjulT
+/sTfKyOxf+9x3Lx5V3VkOrdnkmrNXl8OYWumO+k4nE28WK6V6+MSiL9WRYsQO1ZIS0pNxqbNe7B95yGrjTjnmoHsVSMzduw4iPpfdlPrN9hi7KC973V0HM/JKWxKmD51
+GRIS4+V5HAUBt1z/Yu3fUahdrZOkeTBKeTXDrh0n0a7VYKgV6eQaaoaeS7Cavj34+5mqnTUhMVmexam9WgrpJzHPsHH9Tgz5/md8VvMr1ZHGNZPpkdJzHjd6AVKltsDm
+FR0AHQYVHkW9TzE71HEZeBYTq8Zta4EPRmmfZnj4MEa1YefqT65DGrw7jBDnJZj/mTlFjG/cuIMObYajeegAbNq4E8mpSSqD24abEyhWzZoORr2634r32BONG3yLmzdu
+y/UK+FKDfCah3e76Irn/xefmeNnBA35Cw7o90OTLXmgW9D06th4p3vE09VqpFE7vlvPS5BokPWNNftYz314Wn9zPe7MD69LFGwjftAt//r4By3/7B8uXbsDvS9fj9yXr
+sWzJP6/m0rVy3npEbNmJc2euIklqPLrNPtszWWHhPR8/eYzBA6dh3dptaqTDrTt3Uf+zHujQeoTqoDtx/KJKa47BTn/O4Wh6WUmJKU25hrMwc4r7zVt3sHFjFCaOX4jh
+Q2YiPiFRfuP79l6en14OHU4Kca2qbVG5XCthW9Su3h6PpDBVAmuHJRc0eHcYITYwMDDIZxghNjAwMMhnGCE2MDAwyGcYITYwMDDIZxghNjAwMMhnGCE2MDAwyGcYITYw
+MDDIZxghNjAwMMhnGCE2MDAwyGcYITYwMDDIZxghNjAwMMhnGCE2MDAwyGcYITYwMDDIZxghNjAwMMhnGCE2MDAwyGcYITYwMDDIZxghNjAwMMhnGCE2MDAwyGcYITYw
+MDDIVwD/D9E76/FXrXjyAAAAAElFTkSuQmCC
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox7'
+ Left=5.79438
+ Top=2.01083
+ Width=10.0013
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='閿�鍞嚭搴撳崟'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox8'
+ Left=1.19063
+ Top=2.19604
+ Width=2.01083
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瀹㈡埛锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Left=15.7956
+ Top=2.19604
+ Width=3.81
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleRight
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox3'
+ Left=2.59292
+ Top=2.19604
+ Width=4.81542
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ DataField='瀹㈡埛'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox11'
+ Left=4.78896
+ Top=0.79375
+ Width=12.8058
+ Height=1.21708
+ Object Font
+ Name='妤蜂綋'
+ Size=202500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='涔斾竴缁胯壊鐨崏瓒呯骇宸ュ巶'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox4'
+ Left=15.7956
+ Top=1.40229
+ Width=3.81
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleRight
+ DataField='鍗曟嵁缂栧彿'
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.98979
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid2'
+ Left=-0.0264583
+ Top=-0.105833
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ Object Pen
+ Width=1.5
+ End
+ End
+ ColumnCount=10
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.00542
+ End
+ Item[2]
+ Width=3.01625
+ End
+ Item[3]
+ Width=3.20146
+ End
+ Item[4]
+ Width=2.72521
+ End
+ Item[5]
+ Width=0.93
+ End
+ Item[6]
+ Width=1.69
+ End
+ Item[7]
+ Width=2.01083
+ End
+ Item[8]
+ Width=1.11125
+ End
+ Item[9]
+ Width=2.01083
+ End
+ Item[10]
+ Width=1.87854
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=1.08479
+ End
+ Item[2]
+ Height=0
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鍚堣'
+ BorderCustom=T
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ Object Pen
+ Width=1.5
+ End
+ End
+ End
+ Item[1,2]
+ BorderCustom=T
+ End
+ Item[1,3]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ BorderCustom=T
+ End
+ Item[1,4]
+ BorderCustom=T
+ End
+ Item[1,5]
+ FreeCell=T
+ Items Control
+ Item
+ Type=SummaryBox
+ Name='SummaryBox2'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ DataField='浠舵暟'
+ End
+ End
+ BorderCustom=T
+ End
+ Item[1,6]
+ FreeCell=T
+ Items Control
+ Item
+ Type=SummaryBox
+ Name='SummaryBox4'
+ Dock=Fill
+ TextAlign=MiddleCenter
+ DataField='瀹炲彂鏁伴噺'
+ End
+ End
+ BorderCustom=T
+ End
+ Item[1,7]
+ BorderCustom=T
+ End
+ Item[1,8]
+ BorderCustom=T
+ End
+ Item[1,9]
+ FreeCell=T
+ Items Control
+ Item
+ Type=SummaryBox
+ Name='SummaryBox3'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ DataField='浠风◣鍚堣'
+ End
+ End
+ BorderCustom=T
+ End
+ Item[1,10]
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ BorderCustom=T
+ End
+ Item[2,1]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,2]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,3]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,4]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,5]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,7]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,9]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ Item[2,10]
+ BorderCustom=T
+ Object Border
+ Styles=[DrawTop]
+ End
+ End
+ End
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox4'
+ Left=0.396875
+ Top=1.40229
+ Width=2.19604
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗曚綅(绔�)锛�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox6'
+ Left=11.4035
+ Top=1.40229
+ Width=5.18583
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏀�(鎻�)璐т汉锛�'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox10'
+ Left=2.59292
+ Top=1.40229
+ Width=8.01688
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=112500,0
+ Weight=400
+ Charset=134
+ End
+ Text='瀹佹尝绉戣壓缁胯壊鐨崏闆嗗洟鏈夐檺鍏徃'
+ End
+ End
+ End
+ End
+End
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 8af7ad9..07df65a 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -332,123 +332,129 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBillList.html">鐢熶骇璁㈠崟鍙樻洿鍗曠淮鎶�</a></dd>
</dl>
</dd>
- <!-- <dd>
- <a>鐢熶骇鐢ㄦ枡娓呭崟</a>
+ <dd>
+ <a>鐢熶骇璐ㄩ噺姹囨姤鍗�</a>
<dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟缁存姢</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>
- </dl>
- </dd> -->
- <!-- <dd>
- <a>姹囨姤绠＄悊(宸ュ簭)</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
- <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
- </dl>
- </dd> -->
- <!-- <dd>
- <a>寮�缁撶彮绠＄悊(宸ュ簭)</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">寮�鐝崟</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">寮�鐝崟缁存姢</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_MESReturnStepWorkBillList.html">杩斿伐鍗曠淮鎶�</a></dd>
- </dl>
- </dd> -->
- <!-- <dd>
- <a>鎶ュ伐绠＄悊</a>
- <dl class="layui-nav-child">
- <dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
- <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
- <dd><a lay-href="">鎶ユ鐢宠n</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList_New.html">鐢熶骇璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
</dl>
</dd>
- <dd>
- <a>涓婃枡闃查敊</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="">涓婃枡闃查敊鍗昻</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_MaterToSourceStepBillList.html">涓婃枡闃查敊鍗曠淮鎶�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>缁勮杩芥函鍗�</a>
- <dl class="layui-nav-child">
- <dd><a href="缁勮鍗�/Sc_AssemblyBill_Fast.html" target="main_self_frame">缁勮杩芥函鍗�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/缁勮鍗�/Sc_GroupOrderBillList.html">缁勮杩芥函鍗曠淮鎶�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>缁勬墭鍗�</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鏃ヨ鍒掑钩鍙�</a>
- <dl class="layui-nav-child">
- <dd>
- <a>鐢熶骇璁″垝骞冲彴</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
+ <!-- <dd>
+ <a>鐢熶骇鐢ㄦ枡娓呭崟</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟缁存姢</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>
+ </dl>
+ </dd> -->
+ <!-- <dd>
+ <a>姹囨姤绠＄悊(宸ュ簭)</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd> -->
+ <!-- <dd>
+ <a>寮�缁撶彮绠＄悊(宸ュ簭)</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">寮�鐝崟</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">寮�鐝崟缁存姢</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_MESReturnStepWorkBillList.html">杩斿伐鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd> -->
+ <!-- <dd>
+ <a>鎶ュ伐绠＄悊</a>
+ <dl class="layui-nav-child">
+ <dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
+ <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
+ <dd><a lay-href="">鎶ユ鐢宠n</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>涓婃枡闃查敊</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="">涓婃枡闃查敊鍗昻</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_MaterToSourceStepBillList.html">涓婃枡闃查敊鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>缁勮杩芥函鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a href="缁勮鍗�/Sc_AssemblyBill_Fast.html" target="main_self_frame">缁勮杩芥函鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/缁勮鍗�/Sc_GroupOrderBillList.html">缁勮杩芥函鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>缁勬墭鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鏃ヨ鍒掑钩鍙�</a>
+ <dl class="layui-nav-child">
+ <dd>
+ <a>鐢熶骇璁″垝骞冲彴</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
<!-- <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鏃ヨ鍒掑伐鍗�</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鏃ヨ鍒掑伐鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
<!-- </dl>
- </dd> -->
+ </dd> -->
<!-- <dd>
- <a>瑕佹枡璁″垝</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鎻愭枡璁″垝</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鍩虹璧勬枡</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
- </dl>
- </dd> -->
+ <a>瑕佹枡璁″垝</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎻愭枡璁″垝</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鍩虹璧勬枡</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+ </dl>
+ </dd> -->
<!-- <dd>
- <a>鍗虫椂搴撳瓨</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鎶ヨ〃</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
- </dl>
- </dd>
- </dl>
- </dd> -->
+ <a>鍗虫椂搴撳瓨</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
+ </dl>
+ </dd>
+ </dl>
+ </dd> -->
</dl>
</li>
<!-- 杞﹂棿绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
index 07bbb09..4c99cf8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderLev.html"
@@ -467,6 +467,17 @@
});
})
//#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetOrderLevValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
//淇敼
function set_ShowBill(data) {
if (TagId != "") {
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_SellStyle.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_SellStyle.html"
index af1829e..c27d7f6 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_SellStyle.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_SellStyle.html"
@@ -206,6 +206,16 @@
});
})
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetSellStyleValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 19e04a1..abc6ab3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -135,6 +135,9 @@
var titleData = ["HItemID", "HParentID"];
var ins; //鐢ㄤ簬瀵煎嚭excel
+
+ var params = getUrlVars();
+ var Type = params[params[0]];
//#endregion
var params = getUrlVars();
var Type = params[params[0]];
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/HBarPlanPrint.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/HBarPlanPrint.html"
index 7d69572..89a5628 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -232,6 +232,9 @@
case "Kf_SellOutBillList_BarCodeNote": //閿�鍞爜鍗�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx?linterid=" + value, true, "");
break;
+ case "Kf_SellOutBillList_BarCodeNote_ByCusDefine": //閿�鍞爜鍗�(瀹㈡埛鐗╂枡)
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx?linterid=" + value, true, "");
+ break;
case "Sc_ICMOChangeBillList": //鐢熶骇璁㈠崟鍙樻洿鍗�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ICMOChangeBillList.aspx?linterid=" + value, true, "");
break;
@@ -272,6 +275,9 @@
case "Xs_SellOutChangeBillList": //閿�鍞皟浠峰崟
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Xs_SellOutChangeBillList.aspx?linterid=" + value, true, "");
break;
+ case "Kf_ICStockBackBillList": //閿�鍞��璐у崟
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_ICStockBackBillList.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_ICStockBackBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_ICStockBackBillList.aspx"
new file mode 100644
index 0000000..fabf30b
--- /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/xmlLBM_Kf_ICStockBackBillList.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Kf_ICStockBackBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Kf_ICStockBackBillList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_ICStockBackBillList_Print where hmainid= " + Request.Params["linterid"]);
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_ICStockBackBillList.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_ICStockBackBillList.aspx.cs"
new file mode 100644
index 0000000..838d239
--- /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/xmlLBM_Kf_ICStockBackBillList.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Kf_ICStockBackBillList : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs"
new file mode 100644
index 0000000..29745b8
--- /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/xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Kf_ICStockBackBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx"
new file mode 100644
index 0000000..53c65e4
--- /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/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "exec h_p_Kf_SellOutBillList_BarCodeNote_CusMaterialDefine " + Request.Params["linterid"]);
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs"
new file mode 100644
index 0000000..bafc095
--- /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/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs"
new file mode 100644
index 0000000..cbd4c59
--- /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/xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index ac2d398..c564966 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -581,10 +581,11 @@
}
function btnrowDouble(obj) {
- var index = parent.layer.getFrameIndex(window.name);
- var data = obj.data;
+ var data = [];
+ data.push(obj.data);
//杩斿洖鏂规硶
parent.GetGySource(data);
+ var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
}
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
index 8743b9d..52ebfcc 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
@@ -164,9 +164,15 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export_normal" id="get_export_normal"><i class="layui-icon layui-icon-export"></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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export_normal" id="get_export_normal"><i class="layui-icon layui-icon-export"></i>瀵煎嚭(甯歌)</button>
</div>
</script>
</form>
@@ -201,6 +207,10 @@
var option_Bak = {};
var option1_Bak = {};
var sWhere_Bak = "";
+
+
+ var ins1;
+ var ins2;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -224,6 +234,10 @@
case 'get_export':
get_Export();
break;
+ //瀵煎嚭excel
+ case 'get_export_normal':
+ get_Export_Normal();
+ break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
@@ -232,6 +246,17 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "Kf_SellOutEntryReport";
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable1)', function (obj) {
+ switch (obj.event) {
+ //瀵煎嚭excel
+ case 'get_export_normal':
+ get_Export1_Normal();
break;
};
});
@@ -319,7 +344,7 @@
option1 = {
elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo1'
, height: 'full-50'
, page: true
, totalRow: true
@@ -470,8 +495,8 @@
option1.data = result1;
//娓叉煋琛�1銆佽〃2
- table.render(option);
- table.render(option1);
+ ins1 = table.render(option);
+ ins2 = table.render(option1);
DisPlay_HideColumn();
HPieceQtyTotalSum = HPieceQtySum + HPieceQtySum_YM;
@@ -568,7 +593,7 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 120) <= ''" + HDate1 + "''";
}
if (HCusName) {
- sWhere += " and 瀹㈡埛 like ''%" + HCusName + "%''";
+ sWhere += " and 璐揣鍗曚綅 like ''%" + HCusName + "%''";
}
if (HEmpName) {
sWhere += " and 涓氬姟鍛� like ''%" + HEmpName + "%''";
@@ -646,6 +671,50 @@
}
//#endregion
+ //#region 甯歌瀵煎嚭Execel
+ function get_Export_Normal() {
+ var ModRightNameCheck = "Kf_SellOutEntryReport_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins1.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 甯歌瀵煎嚭Execel
+ function get_Export1_Normal() {
+ var ModRightNameCheck = "Kf_SellOutEntryReport_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins2.config.id, option1.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.html"
index 0e15aed..83c96d3 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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList_New.html"
@@ -89,7 +89,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>娴忚</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -134,7 +134,7 @@
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HDeptID", "HEmpID", "HManagerID", "HCurID", "HCusID", "HSSID", "HAccCusID", "HBankID"];
+ var titleData = ["hmainid", "HMainEmpID", "HDeptID","HGroupID","HOrgID","hsubid","HMaterID","HUnitID","HEmpID","HSourceID","HBadReasonID","HICMOInterID","HICMOEntryID","HICMOBillNo","HProcExchInterID","HProcExchEntryID","HProcExchBillNo","HSourceInterID","HSourceEntryID","HSourceBillNo","HSourceBillType","HBarCode","HReportType","HAddr","HMaker","HMakeDate","HMainSourceInterID","HMainSourceEntryID","HMainSourceBillNo","HMainSourceBillType"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "3717";
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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 271151d..ed7208c 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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -258,6 +258,7 @@
</script>
<script>
//#region 鎶樺彔娉ㄩ噴
+ var HDataTemp = {};
//#endregion
layui.config({
base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -941,7 +942,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -949,7 +950,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -966,7 +967,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐧昏浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -974,7 +975,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
@@ -991,9 +992,9 @@
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鐧昏浜哄垪琛�'//鏍囬
+ , title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1095,6 +1096,11 @@
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
+ if (option.data.length == 0) {
+ layer.msg("鐢熶骇璐ㄩ噺姹囨姤鍗曞瓙琛ㄤ腑鏈瓨鍦ㄨ褰�!");
+ return false;
+ }
+
for (var i = 0; i < option.data.length; i++) {
//鏁伴噺鏍煎紡鏍￠獙
temp = option.data[i]["HQty"] + "";
@@ -1274,6 +1280,8 @@
if (event.key == "F7") {
//鐗╂枡
if (obj.event == "HMaterID") {
+ var HOrgID = $("#HOrgID").val();
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1282,7 +1290,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1296,13 +1304,27 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+ , "鐗╂枡浠ｇ爜": checkStatus.data[0].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
, "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -1328,10 +1350,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": HDataTemp.HItemID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -1345,7 +1377,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1361,6 +1393,16 @@
, "HEmpID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": HDataTemp.HItemID
+ , "妫�楠屽憳": HDataTemp.鑱屽憳鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -1391,6 +1433,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": HDataTemp.HItemID
+ , "鐢熶骇璧勬簮": HDataTemp.鐢熶骇璧勬簮鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
})
}
//涓嶈壇鍘熷洜
@@ -1419,6 +1471,16 @@
, "HBadReasonID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HBadReasonID": HDataTemp.HItemID
+ , "涓嶈壇鍘熷洜": HDataTemp.涓嶈壇鍘熷洜鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -1476,7 +1538,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = ["HMaterID", "HUnitID", "HEmpID", "HSourceID", "HBadReasonID", "鐢熶骇璁㈠崟涓诲唴鐮�", "鐢熶骇璁㈠崟瀛愬唴鐮�", "鐢熶骇璁㈠崟鍙�", "宸ュ簭娴佽浆鍗″唴鐮�", "宸ュ簭娴佽浆鍗″瓙鍐呯爜", "宸ュ簭娴佽浆鍗″彿", "婧愬崟鍐呯爜", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "鏉″舰鐮�", "姹囨姤绫诲瀷", "MAC鏈哄櫒鍦板潃", "鎵弿浜�", "鎵弿鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- titleData = [];
+ //titleData = [];
dataCol = data1.data[0].HGridString.split(',');
@@ -1572,7 +1634,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Xs_SeOrderChangeBill/AuditXs_SeOrderChangeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_QualityReportBill/AuditSc_QualityReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -1581,6 +1643,8 @@
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
});
} else {
@@ -1624,7 +1688,7 @@
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖閿�鍞憳
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
getEmpInfoByHEmpID(obj[0].HItemID);
@@ -1632,10 +1696,41 @@
function GetHDeptNameValue(obj) //杩斿洖閿�鍞儴闂�
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
+ function GetHGroupValue(obj) //杩斿洖鐝粍
+ {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+
+ function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetHSecManagerValue(obj) //杩斿洖妫�楠屽憳
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetGySource(obj) //杩斿洖鐢熶骇璧勬簮
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetBadReasonaValue(obj) //杩斿洖涓嶈壇鍘熷洜
+ {
+ HDataTemp = obj[0];
+ }
+
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
function dealDoubleToFixed(data, num) {
//鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 57aa990..59b25e3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -462,6 +462,12 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPlanOrderProcNo" id="HPlanOrderProcNo" value="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
<!--闅愯棌瀛楁-->
@@ -1056,6 +1062,8 @@
, "HSourceBillType": "1401"
, "HMainSourceBillSubType": data.HBillSubType
+ , "HPlanOrderProcNo": data.鍗曟嵁鍙�
+
, "HEmpID": data.HEmpID
, "HEmpName": data.涓氬姟鍛�
, "HCusID": data.HCusID
@@ -1250,6 +1258,7 @@
, "hupdatedate": OperationType == 2 ? "" : d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
, "hdeleteman": OperationType == 2 ? "" : d.data[0].浣滃簾浜�
, "hdeletedate": OperationType == 2 ? "" : d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HPlanOrderProcNo": d.data[0].HPlanOrderProcNo
});
form.render('select');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index a183d7b..457afb3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -227,7 +227,7 @@
</div>
</div>
</div>
- </div>
+ </div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<!--<div class="layui-btn-container">
@@ -316,13 +316,13 @@
var sWhere = "";
var HModName = "Sc_ICMOBillList";
var HDeptID = 0;
-
+
var params = getUrlVars();
var HDeptID = params[params[0]];
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
- var titleData = ["閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData = [];
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -333,10 +333,10 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
- var HClassTag = "ForFilteringSchemes";
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
- window.HModuleName = "鐢熶骇璁㈠崟";
+ window.HModuleName = "鐢熶骇璁㈠崟";
//鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -524,7 +524,7 @@
});
- //鑾峰彇缁勭粐
+ //鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
@@ -576,13 +576,13 @@
//#endregion
//#region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ get_DefaultModule();
}
//#endregion
@@ -781,64 +781,69 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
- }
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
- 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 });
- }
- }
- }
+ //var data = [];
+ //var col = [];
+ ////缁欑┖鐨勬暟缁勮祴鍊�
+ //for (var key in data1.list) {
+ // //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ // data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ // //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ // var patrn = new RegExp(/^h/i);
+ // if (patrn.test(data1.list[key].ColmCols)) {
+ // titleData[key] = data1.list[key].ColmCols;
+ // }
+ //}
+ ////鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left', 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')}}</div>", width: 200 });
+ // break;
+ // case 'long':
+ // case 'Int32':
+ // case 'Int64':
+ // case 'double':
+ // case 'Decimal':
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ // break;
+ // default:
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ // }
+ // }
+ //}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , cols: [col]
- , data: data1.data
- , height: 'full-120'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
- table.render(option);
+ ////鍔ㄦ�佹樉绀哄垪鍚�
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 'full-120'
+ // , page: true
+ // , limits: [50, 500, 5000, 50000]
+ // , limit: 50
+ // , cellMinWidth: 90
+ // , done: function (res, curr, count) {
+ // soulTable.render(this);
+ // }
+ //}
+ //ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ ////鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+
+ option.data = data1.data;
+ ins = table.render(option);
+ layer.close(ajaxLoad);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -849,11 +854,10 @@
ColFilter();
}
layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
- }
+ }
}, error: function () {
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1011,7 +1015,7 @@
if (GetDataCols != "") {
sWhere += GetDataCols;
}
- sWhere += addSWhereByOpenType();
+ sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -1197,7 +1201,7 @@
//#endregion
- //#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
+ //#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
function set_PushProductInBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1218,7 +1222,7 @@
}
if (data[i].琛岀姸鎬� != "" ) {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
}
@@ -1298,8 +1302,8 @@
}
}
//#endregion
-
- //#region 涓嬫帹锛堢敓浜ч��搴撳崟锛�
+
+ //#region 涓嬫帹锛堢敓浜ч��搴撳崟锛�
function set_PushProductionReturnBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1320,7 +1324,7 @@
}
if (data[i].琛岀姸鎬� != "" ) {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
}
@@ -1452,7 +1456,7 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
- }
+ }
// 澶嶅埗
function set_copy() {
@@ -1818,7 +1822,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+ //var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -2139,7 +2143,7 @@
//鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
var HIsClose_Manual = false;
//鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
- var Filter = document.getElementsByClassName(HClassTag);
+ var Filter = document.getElementsByClassName(HClassTag);
var HFilterIdList = "";//杩囨护鏉′欢
var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
@@ -2149,7 +2153,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
@@ -2350,7 +2354,7 @@
//#endregion
-
+
//#endregion
//#region 鑾峰彇婧愬崟-鐢熶骇璁㈠崟鍗曟嵁鐘舵��
@@ -2376,7 +2380,7 @@
}
//#endregion
- //#region 鑾峰彇鍙傛暟
+ //#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -2388,7 +2392,7 @@
return vars;
}
//#endregion
- //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
var params = getUrlVars();
@@ -2424,7 +2428,7 @@
var HRemark = data[0].澶囨敞
//鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
document.getElementById("HFilterScheme_Now").style.display = "block";
- document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
HInterID = data[0].hmainid
//鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
for (let i = 0; i < data.length; i++) {
@@ -2444,7 +2448,7 @@
}
});
}
- //#endregion
+ //#endregion
function GetDataCol(data) {
GetDataCols = data;
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.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.html"
index 1c54959..7a2d21c 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.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.html"
@@ -663,6 +663,12 @@
<input type="text" class="layui-input" name="HPickLabelNumber" id="HPickLabelNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
</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="HPlanOrderProcNo" id="HPlanOrderProcNo" value="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -2261,6 +2267,7 @@
, "HMaterIDC": data.鍘熸潗鏂欏唴鐮丆
, "HMaterIDD": data.鍘熸潗鏂欏唴鐮丏
+ , "HPlanOrderProcNo": data.HPlanOrderProcNo
//缇婃瘺淇℃伅
, "HHeight": data.姣涢珮
@@ -2588,6 +2595,8 @@
$("#HWeight_New").val(data.鐢熶骇鍏嬮噸);
$("#HRemark_New").val(data.鐢熶骇瑙勬牸);
+ $("#HPlanOrderProcNo").val(data.HPlanOrderProcNo);
+
$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
form.render("checkbox");
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_Mul.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_Mul.html"
index 2851720..29b6cf4 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_Mul.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_Mul.html"
@@ -237,6 +237,12 @@
<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark">
</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="HPlanOrderProcNo" id="HPlanOrderProcNo" value="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -775,6 +781,8 @@
//$("#HAuxUnit").val(data1.data[0].HAuxUnit);
$("#HMaterModel").val(data1.data[0].瑙勬牸鍨嬪彿);
+ $("#HPlanOrderProcNo").val(data1.data[0].HPlanOrderProcNo);
+
$.ajax({
type: "get",
url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
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_DayRkReport.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_DayRkReport.html"
index 63a3e68..f64604f 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_DayRkReport.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_DayRkReport.html"
@@ -133,8 +133,16 @@
<table class="" id="mainTable1" lay-filter="mainTable1"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo1">
+ <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>
</script>
</form>
@@ -170,6 +178,11 @@
var titleData = ["HCusID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var option_bak;
+ var option1_bak;
+
+ var ins; //鐢ㄤ簬瀵煎嚭琛�1 excel
+ var ins1; //鐢ㄤ簬瀵煎嚭琛�2 excel
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -186,6 +199,26 @@
switch (obj.event) {
//閫�鍑�
case 'btn-exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable1)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export_1();
break;
//闅愯棌鍒楄缃�
case 'HideColumn':
@@ -301,7 +334,9 @@
}
}
};
- table.render(option);
+ ins = table.render(option);
+
+ option_bak = option;
} else {
layer.alert(data1.count + data1.Message, { icon: 5 })
}
@@ -358,7 +393,7 @@
}
option = {
elem: '#mainTable1'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo1'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
@@ -375,7 +410,10 @@
}
}
};
- table.render(option);
+ ins1 = table.render(option);
+
+ option1_bak = option;
+
$("#HWeight").val(HWeight.toFixed(2));
$("#HNumberOH").val(HNumberOH.toFixed(2));
$("#HActualHQty").val(HActualHQty.toFixed(2));
@@ -530,6 +568,49 @@
sWhere = "";
}
+ //#region 瀵煎嚭琛�1 Execel
+ function get_Export() {
+ var ModRightNameCheck = "SC_DayRkReport_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_bak.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 瀵煎嚭琛�2 Execel
+ function get_Export_1() {
+ var ModRightNameCheck = "SC_DayRkReport_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins1.config.id, option1_bak.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
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/SemiFinishedProductsReport.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/SemiFinishedProductsReport.html"
index 7b7bdef..ee9a86e 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/SemiFinishedProductsReport.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/SemiFinishedProductsReport.html"
@@ -97,8 +97,16 @@
<table class="" id="mainTable1" lay-filter="mainTable1"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo1">
+ <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>
</script>
</form>
@@ -133,6 +141,12 @@
var HActualHQty = 0;
var titleData = ["HCusID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ var option_bak;
+ var option1_bak;
+
+ var ins; //鐢ㄤ簬瀵煎嚭琛�1 excel
+ var ins1; //鐢ㄤ簬瀵煎嚭琛�2 excel
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -149,6 +163,26 @@
switch (obj.event) {
//閫�鍑�
case 'btn-exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable1)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export_1();
break;
//闅愯棌鍒楄缃�
case 'HideColumn':
@@ -261,7 +295,9 @@
}
}
};
- table.render(option);
+ ins = table.render(option);
+
+ option_bak = option;
} else {
layer.alert(data1.count + data1.Message, { icon: 5 })
}
@@ -334,7 +370,10 @@
}
}
};
- table.render(option);
+ ins1 = table.render(option);
+
+ option1_bak = option;
+
$("#HWeight").val(HWeight.toFixed(2));
$("#HNumberOH").val(HNumberOH.toFixed(2));
$("#HActualHQty").val(HActualHQty.toFixed(2));
@@ -437,6 +476,49 @@
sWhere = "";
}
+ //#region 瀵煎嚭琛�1 Execel
+ function get_Export() {
+ var ModRightNameCheck = "SemiFinishedProductsReport_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_bak.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 瀵煎嚭琛�2 Execel
+ function get_Export_1() {
+ var ModRightNameCheck = "SemiFinishedProductsReport_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins1.config.id, option1_bak.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBill.html"
index eb745d7..01e7ef6 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBill.html"
@@ -608,7 +608,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
// var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -633,7 +633,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
// var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -687,7 +687,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞富绠″垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -695,7 +695,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HManagerName").val(checkStatus.data[0].HName);
+ $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HManagerID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -908,13 +908,13 @@
function GetHDeptNameValue(obj) //杩斿洖閿�鍞儴闂�
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
function GetHEmpValue(obj) //杩斿洖閿�鍞憳
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
getEmpInfoByHEmpID(obj[0].HItemID);
@@ -932,7 +932,7 @@
function GetHManagerValue(obj) //杩斿洖閿�鍞富绠�
{
- $("#HManagerName").val(obj[0].HName);
+ $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HManagerID").val(obj[0].HItemID);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 66277ee..74f6fef 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -316,7 +316,7 @@
</script>
<script>
-
+ var HDataTemp = {};
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -953,6 +953,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HProjectMoneyID": HDataTemp.HItemID
+ , "HPMoneyName": HDataTemp.椤圭洰璐圭敤鍚嶇О
+ })
+ HDataTemp = {};
+ }
+ }
});
}
obj.event = "";
@@ -995,7 +1005,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1367,31 +1377,6 @@
}
//#endregion
-
- //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
- function getHTaxRateByCusID(HCusID) {
- $.ajax({
- url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
- async: false,
- type: "GET",
- data: {
- "HCusID": HCusID
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
- $("#HTaxRate").val(data.HTaxRate);
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
- //#endregion
-
//#region 鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇閮ㄩ棬 缁忔墜浜�
function getCzyglByUser() {
$.ajax({
@@ -1420,57 +1405,37 @@
});
}
//#endregion
-
- //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜� 绋庣巼
- function getCustomerByCusID(HCusID) {
- $.ajax({
- url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
- async: false,
- type: "GET",
- data: {
- "HCusID": HCusID
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
-
- $("#HCusID").val(data.HCusID);
- $("#HCusName").val(data.HCusName);
- $("#HCurID").val(data.HCurID);
- $("#HCurName").val(data.HCurName);
- $("#HExRate").val(data.HExRate);
- $("#HTaxRate").val(data.HTaxRate);
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
- //#endregion
-
//#endregion
});
+ function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
+ {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
- //function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
- //{
- // $("#HDeptName").val(obj[0].HName);
- // $("#HDeptID").val(obj[0].HItemID);
- //}
+ getEmpInfoByHEmpID(obj[0].HItemID)
+ }
- //function GetHEmpValue(obj) //杩斿洖缁忔墜浜�
- //{
- // $("#HEmpName").val(obj[0].HName);
- // $("#HEmpID").val(obj[0].HItemID);
- //}
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
- //function GetHSupValue(obj) //杩斿洖瀹㈡埛
- //{
- // $("#HCusName").val(obj[0].HName);
- // $("#HCusID").val(obj[0].HItemID);
- //}
+ function GetProjectMoneyValue(obj) //杩斿洖璐圭敤椤圭洰
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetHSupValue(obj) //杩斿洖瀹㈡埛
+ {
+ $("#HCusName").val(obj[0].HName);
+ $("#HCusID").val(obj[0].HItemID);
+ var HCusID = $("#HCusID").val();
+ getHTaxRateByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
+ getCustomerByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜�,绋庣巼
+ }
+
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
function dealDoubleToFixed(data, num) {
//鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
@@ -1531,6 +1496,59 @@
});
}
//#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
+ function getHTaxRateByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ $("#HTaxRate").val(data.HTaxRate);
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜� 绋庣巼
+ function getCustomerByCusID(HCusID) {
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCustomerByCusID",
+ async: false,
+ type: "GET",
+ data: {
+ "HCusID": HCusID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ $("#HCusID").val(data.HCusID);
+ $("#HCusName").val(data.HCusName);
+ $("#HCurID").val(data.HCurID);
+ $("#HCurName").val(data.HCurName);
+ $("#HExRate").val(data.HExRate);
+ $("#HTaxRate").val(data.HTaxRate);
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
index 7fc7b24..bfc25f2 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBill.html"
@@ -789,7 +789,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
// var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -871,7 +871,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -879,7 +879,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1245,7 +1245,7 @@
function GetHEmpValue(obj) //杩斿洖閿�鍞憳
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
getEmpInfoByHEmpID(obj[0].HItemID);
@@ -1285,7 +1285,7 @@
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
- $("#HSSName").val(obj[0].HName);
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(obj[0].HItemID);
}
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 f69ba98..f0ce3f0 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"
@@ -805,7 +805,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
// var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -830,7 +830,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
//, btn: ['纭畾', '鍙栨秷']
//, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
// var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -912,7 +912,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -920,7 +920,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1364,13 +1364,13 @@
function GetHDeptNameValue(obj) //杩斿洖閿�鍞儴闂�
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
function GetHEmpValue(obj) //杩斿洖閿�鍞憳
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
getEmpInfoByHEmpID(obj[0].HItemID)
@@ -1402,10 +1402,16 @@
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
- $("#HSSName").val(obj[0].HName);
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(obj[0].HItemID);
}
+ function GetHAccCusValue(obj) //杩斿洖缁撶畻鍗曚綅
+ {
+ $("#HAccCusName").val(obj[0].HName);
+ $("#HAccCusID").val(obj[0].HItemID);
+ }
+
//#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮�
function getCustomerByCusID(HCusID) {
$.ajax({
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 27c74b7..d82c1c8 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"
@@ -436,6 +436,7 @@
</script>
<script>
//#region 鎶樺彔娉ㄩ噴
+ var HDataEmp = {};
//#endregion
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -1514,7 +1515,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1522,7 +1523,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
@@ -1532,7 +1533,8 @@
$("#HEmpName").val("");
$("#HEmpID").val("0");
- getEmpInfoByHEmpID("0");
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
}
})
}
@@ -1625,7 +1627,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1633,7 +1635,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1675,7 +1677,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞柟寮忓垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1683,7 +1685,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSellSName").val(checkStatus.data[0].HName);
+ $("#HSellSName").val(checkStatus.data[0].閿�鍞柟寮忓悕绉�);
$("#HSellSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1700,7 +1702,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1708,7 +1710,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1931,10 +1933,12 @@
//#endregion
//#region 瀛愯〃 鏁版嵁妫�楠�
+ var RowCount = 0;
for (var i = 0; i < option.data.length; i++) {
if (option.data[i]["HMaterID"] == "0") {
continue;
}
+ RowCount++;
if (option.data[i]["HUnitID"] == "0") {
layer.msg("绗�" + i + "琛岋細璁￠噺鍗曚綅鏈�夋嫨锛�");
@@ -2096,6 +2100,10 @@
// layer.msg("绗�" + i + "琛岋細寮�绁ㄦ暟閲忚杈撳叆澶т簬0鐨勬暟瀛楋紒");
// return false;
//}
+ }
+ if (RowCount == 0) {
+ layer.msg("淇濆瓨澶辫触锛屽瓙琛ㄨ嚦灏戦渶瑕佸瓨鍦ㄤ竴琛岃褰曢�夋嫨浜嗙墿鏂欙紒");
+ return false;
}
//#endregion
@@ -2604,6 +2612,20 @@
layer.close(index);//鍏抽棴寮圭獥
}
+ , end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataEmp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataEmp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataEmp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataEmp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataEmp.HUnitID
+ , "璁￠噺鍗曚綅": HDataEmp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataEmp = {};
+ }
+ }
})
}
//璁￠噺鍗曚綅
@@ -2616,7 +2638,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2628,10 +2650,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": HDataEmp.HItemID
+ , "璁￠噺鍗曚綅": HDataEmp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
}
@@ -2700,6 +2732,16 @@
, "HOrderLevID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }, end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "璁㈠崟绛夌骇鍚嶇О": HDataEmp.璁㈠崟绛夌骇
+ , "璁㈠崟绛夌骇浠ｇ爜": HDataEmp.璁㈠崟绛夌骇浠ｇ爜
+ , "HOrderLevID": HDataEmp.HItemID
+ })
+ HDataEmp = {};
+ }
}
})
}
@@ -3246,9 +3288,7 @@
function set_HBillMoney(HEarnestRate) {
var HBillMoney = 0;
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HisStockGoods"] == "false") {
- HBillMoney += option.data[i]["HlineTotal"] * 1;
- }
+ HBillMoney += option.data[i]["HlineTotal"] * 1;
}
@@ -3261,9 +3301,15 @@
function setHEarnestRateByHisStockGoods() {
if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "true") {
var HEarnestRateList = '<option value="0" selected="selected" >0%</option>';
+ HEarnestRateList += '<option value="100" >100%</option>';
$("#HEarnestRate").empty();
$("#HEarnestRate").append(HEarnestRateList);
+
+ //var HEarnestRateListArray = ["0", "100"];
+ //if ($.inArray(HEarnestRateTemp+"", HEarnestRateListArray) > -1) {
+ // $("#HEarnestRate").val(HEarnestRateTemp);
+ //}
form.render('select');
} else if (option.data.length > 0 && option.data[0]["HisStockGoods"] == "false") {
var HEarnestRateList = '<option value="50" selected="selected" >50%</option>';
@@ -3272,7 +3318,7 @@
$("#HEarnestRate").empty();
$("#HEarnestRate").append(HEarnestRateList);
/*form.render('select');*/
- $("#HEarnestRate").val(HEarnestRateTemp);
+ //$("#HEarnestRate").val(HEarnestRateTemp);
form.render('select');
} else {
var HEarnestRateList = '<option value="50" selected="selected" >50%</option>';
@@ -3281,7 +3327,7 @@
$("#HEarnestRate").empty();
$("#HEarnestRate").append(HEarnestRateList);
//form.render('select');
- $("#HEarnestRate").val(HEarnestRateTemp);
+ /* $("#HEarnestRate").val(HEarnestRateTemp);*/
form.render('select');
}
}
@@ -3395,7 +3441,7 @@
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
getEmpInfoByHEmpID(obj[0].HItemID)
@@ -3419,22 +3465,37 @@
function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
- $("#HSSName").val(obj[0].HName);
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(obj[0].HItemID);
}
function GetSellStyleValue(obj) //杩斿洖閿�鍞柟寮�
{
- $("#HSellSName").val(obj[0].HName);
+ $("#HSellSName").val(obj[0].閿�鍞柟寮忓悕绉�);
$("#HSellSID").val(obj[0].HItemID);
}
+ function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ {
+ HDataEmp = obj[0];
+ }
+
+ function GetUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ HDataEmp = obj[0];
+ }
+
+ function GetOrderLevValue(obj) //璁㈠崟绛夌骇鍒楄〃
+ {
+ HDataEmp = obj[0];
+ }
+
//#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
function getCustomerByCusID(HCusID) {
$.ajax({
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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
index f6fd6c3..ec1c796 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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.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\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBill.html"
@@ -946,7 +946,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -954,7 +954,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -971,7 +971,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -979,7 +979,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(checkStatus.data[0].HItemID);
getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
@@ -1050,7 +1050,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1058,7 +1058,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSSName").val(checkStatus.data[0].HName);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1075,7 +1075,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閿�鍞柟寮忓垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1083,7 +1083,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSellSName").val(checkStatus.data[0].HName);
+ $("#HSellSName").val(checkStatus.data[0].閿�鍞柟寮忓悕绉�);
$("#HSellSID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1783,12 +1783,12 @@
//浠ヤ笂鏄痩ayui妯″潡
});
// 鍩虹璧勬枡杩斿洖鏁版嵁
- function GetHEmpValue(obj) //杩斿洖閿�鍞憳
+ function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
- $("#HEmpName").val(obj[0].HName);
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
$("#HEmpID").val(obj[0].HItemID);
- getEmpInfoByHEmpID(obj[0].HItemID);
+ getEmpInfoByHEmpID(obj[0].HItemID)
}
function GetHSupValue(obj) //杩斿洖瀹㈡埛
@@ -1803,21 +1803,21 @@
$("#HManagerID").val(obj[0].HItemID);
}
- function GetHDeptNameValue(obj) //杩斿洖閿�鍞儴闂�
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
{
- $("#HDeptName").val(obj[0].HName);
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
function GetSettleStyleValue(obj) //杩斿洖缁撶畻鏂瑰紡
{
- $("#HSSName").val(obj[0].HName);
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
$("#HSSID").val(obj[0].HItemID);
}
function GetSellStyleValue(obj) //杩斿洖閿�鍞柟寮�
{
- $("#HSellSName").val(obj[0].HName);
+ $("#HSellSName").val(obj[0].閿�鍞柟寮忓悕绉�);
$("#HSellSID").val(obj[0].HItemID);
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
index 132d607..6c0d392 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBill.html"
@@ -421,6 +421,7 @@
<script>
//#region 鎶樺彔娉ㄩ噴
+ var HDataTemp = {};
//#endregion
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -1173,7 +1174,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍙戣揣浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
})
}
//#endregion
@@ -1186,7 +1187,7 @@
, area: ['90%', '90%']//澶у皬
, title: '浠撶鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
})
}
//#endregion
@@ -1216,7 +1217,7 @@
}
//#endregion
- //#region 閫夋嫨鍑哄簱浠撳簱
+ //#region 閫夋嫨鍏ュ簱浠撳簱
function get_checkWH() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1224,7 +1225,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍑哄簱浠撳簱鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HSCWHID', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1232,14 +1233,14 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HWHName").val(checkStatus.data[0].HName);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
$("#HWHID").val(checkStatus.data[0].HItemID);
//鏍规嵁琛ㄥご 鍑哄簱浠撳簱 甯﹀嚭瀛愯〃 鍙戣揣浠撳簱
for (var i = 0; i < option.data.length; i++) {
if (option.data[i].HWHID + "" == "0") {
option.data[i].HWHID = checkStatus.data[0].HItemID;
- option.data[i].鍙戣揣浠撳簱 = checkStatus.data[0].HName;
+ option.data[i].鍙戣揣浠撳簱 = checkStatus.data[0].浠撳簱鍚嶇О;
}
}
table.render(option);
@@ -1247,6 +1248,20 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏍规嵁琛ㄥご 鍑哄簱浠撳簱 甯﹀嚭瀛愯〃 鍙戣揣浠撳簱
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].HWHID + "" == "0") {
+ option.data[i].HWHID = HDataTemp.HItemID;
+ option.data[i].鍙戣揣浠撳簱 = HDataTemp.浠撳簱鍚嶇О;
+ }
+ }
+ table.render(option);
+
+ HDataTemp = {};
+ }
+ }
})
}
//#endregion
@@ -1958,6 +1973,8 @@
if (event.key == "F7") {
//鐗╂枡
if (obj.event == "HMaterID") {
+ var HOrgID = $("#HOrgID").val();
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1966,7 +1983,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1979,14 +1996,28 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HMaterID": checkStatus.data[0].HItemID
- , "鐗╂枡浠ｇ爜": checkStatus.data[0].HNumber
- , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
- , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
- , "HUnitID": checkStatus.data[0].HUnitID
- , "璁￠噺鍗曚綅": checkStatus.data[0].HUnitName
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -2000,7 +2031,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2012,10 +2043,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": HDataTemp.HItemID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -2029,7 +2070,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HSubWHID', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2041,10 +2082,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "鍙戣揣浠撳簱": checkStatus.data[0].HName
+ "鍙戣揣浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
, "HWHID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": HDataTemp.HItemID
+ , "鍙戣揣浠撳簱": HDataTemp.浠撳簱鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -2552,10 +2603,11 @@
$("#HDeptID").val(obj[0].HItemID);
}
- function GetHWHValue(obj) //杩斿洖浠撳簱
+ function GetHWHValue(obj) //杩斿洖鍏ュ簱浠撳簱
{
- //$("#HWHName").val(obj[0].HName);
- //$("#HWHID").val(obj[0].HItemID);
+ $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(obj[0].HItemID);
+ HDataTemp = obj[0];
}
function GetSellStyleValue(obj) //杩斿洖閿�鍞柟寮�
@@ -2566,13 +2618,13 @@
function GetHKeeperValue(obj) //杩斿洖淇濈鍛�
{
- $("#HKeeperName").val(obj[0].HName);
+ $("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
$("#HKeeperID").val(obj[0].HItemID);
}
function GetHWorkerValue(obj) //杩斿洖鍙戣揣浜猴紙鎿嶄綔宸ワ級
{
- $("#HSecManagerName").val(obj[0].HName);
+ $("#HSecManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HSecManagerID").val(obj[0].HItemID);
}
@@ -2593,6 +2645,21 @@
$("#HWHID").val(obj[0].HItemID);
}
+ function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetHSubWHValue(obj) //瀛愯〃鍙戣揣浠撳簱
+ {
+ HDataTemp = obj[0];
+ }
+
//#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
function getCustomerByCusID(HCusID) {
$.ajax({
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
index dda9c38..386a94f 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
@@ -818,28 +818,28 @@
//#region 鎵撳嵃
function get_PrintReport() {
- //var checkStatus = table.checkStatus('mainTable')
- // , data = checkStatus.data;
- //if (checkStatus.data.length === 1) {
- // if (data[0].鐘舵�� != "宸插鏍�") {
- // layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
- // return;
- // }
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ if (data[0].鐘舵�� != "宸插鏍�") {
+ layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
+ return;
+ }
- // layer.open({
- // type: 2
- // , area: ['50%', '50%']
- // , title: '鎵撳嵃妯＄増閫夋嫨'
- // , shade: 0.6 //閬僵閫忔槑搴�
- // , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_ICStockBackBillList', 'yes']
- // , resize: false
- // })
- //}
- //else {
- // layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
- //}
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_ICStockBackBillList', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
}
//#endregion
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 ba775e7..4270f38 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"
@@ -459,6 +459,7 @@
<script>
//#region 鎶樺彔娉ㄩ噴
+ var HDataTemp = {};
//#endregion
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -1062,7 +1063,8 @@
data: { "HBillType": '1205' },
success: function (d) {
//var HBillNo = d.data[0].HBillNo.replace("XSCK", "XSXT");
- $("#HBillNo").val(HBillNo);
+ //$("#HBillNo").val(HBillNo);
+ $("#HBillNo").val(d.data[0].HBillNo);
$("#HInterID").val(d.data[0].HInterID);
}
});
@@ -1237,7 +1239,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍙戣揣浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1262,7 +1264,7 @@
, area: ['90%', '90%']//澶у皬
, title: '浠撶鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1335,6 +1337,20 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function () {
+ if (HDataTemp != {}) {
+ //鏍规嵁琛ㄥご 鍑哄簱浠撳簱 甯﹀嚭瀛愯〃 鍙戣揣浠撳簱
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].HWHID + "" == "0") {
+ option.data[i].HWHID = HDataTemp.HItemID;
+ option.data[i].鍙戣揣浠撳簱 = HDataTemp.浠撳簱鍚嶇О;
+ }
+ }
+ table.render(option);
+
+ HDataTemp = {};
+ }
+ }
})
}
//#endregion
@@ -2134,6 +2150,8 @@
if (event.key == "F7") {
//鐗╂枡
if (obj.event == "HMaterID") {
+ var HOrgID = $("#HOrgID").val();
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -2142,7 +2160,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2163,6 +2181,20 @@
, "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HMaterID": HDataTemp.HItemID
+ , "鐗╂枡浠ｇ爜": HDataTemp.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": HDataTemp.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": HDataTemp.瑙勬牸鍨嬪彿
+ , "HUnitID": HDataTemp.HUnitID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -2192,6 +2224,16 @@
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataTemp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": HDataTemp.HItemID
+ , "璁￠噺鍗曚綅": HDataTemp.璁￠噺鍗曚綅鍚嶇О
+ })
+ HDataTemp = {};
+ }
}
})
}
@@ -2290,9 +2332,25 @@
//#region 鍦ㄦ湯灏惧鍔犱竴琛�
function btnAddLine(NewRow) {
+ if (option.data.length > 0) {
+ NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
+ } else {
+ NewRow.HisStockGoods = "false";
+ }
+
+
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+
+ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+ setSelectHisStockGoodsByTableRender();
+
+ //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
+ //setHEarnestRateByHisStockGoods();
+
+ //璁剧疆琛ㄥご鎵�闇�閲戦
+ set_HBillMoney($("#HEarnestRate").val() * 1);
//rows++;
layer.msg('澧炲姞涓�琛屾寜閽紒')
}
@@ -2847,13 +2905,13 @@
function GetHKeeperValue(obj) //杩斿洖淇濈鍛�
{
- $("#HKeeperName").val(obj[0].HName);
+ $("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
$("#HKeeperID").val(obj[0].HItemID);
}
- function GetHWorkerValue(obj) //杩斿洖鍙戣揣浜猴紙鎿嶄綔宸ワ級
+ function GetHSecManagerValue(obj) //杩斿洖鍙戣揣浜猴紙鎿嶄綔宸ワ級
{
- $("#HSecManagerName").val(obj[0].HName);
+ $("#HSecManagerName").val(obj[0].鑱屽憳鍚嶇О);
$("#HSecManagerID").val(obj[0].HItemID);
}
@@ -2913,6 +2971,21 @@
layui.table.render(option);
}
+ function GetMaterValue(obj) //鐗╂枡鍚嶇О
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetUnitValue(obj) //璁￠噺鍗曚綅
+ {
+ HDataTemp = obj[0];
+ }
+
+ function GetHSubWHValue(obj) //瀛愯〃鍙戣揣浠撳簱
+ {
+ HDataTemp = obj[0];
+ }
+
//#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
function getCustomerByCusID(HCusID) {
$.ajax({
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_SellOutBillList_BarCodeNote.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_SellOutBillList_BarCodeNote.html"
index 50207fd..d2e7c0e 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_SellOutBillList_BarCodeNote.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_SellOutBillList_BarCodeNote.html"
@@ -20,6 +20,7 @@
<div style="padding: 2px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn-Print" id="btn-Print">鎵撳嵃鐮佸崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn-PrintByCusDefine" id="btn-PrintByCusDefine">鎵撳嵃鐮佸崟(瀹㈡埛鐗╂枡)</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -127,6 +128,21 @@
})
//#endregion
+ //#region 鎵撳嵃鐮佸崟(瀹㈡埛鑷畾涔�)
+ form.on('submit(btn-PrintByCusDefine)', function () {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid + '&MyMsg=' + linterid + '&Type=Kf_SellOutBillList_BarCodeNote_ByCusDefine', 'yes']
+ , resize: false
+ })
+ })
+ //#endregion
+
//#region 瀛愯〃0锛氬ご宸ュ叿鏍忎簨浠�
table.on('toolbar(mainTable0)', function (obj) {
switch (obj.event) {
--
Gitblit v1.9.1