From 49946b8f44a35c54768a3fd606f925c2a0bc5dff Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 04 三月 2024 17:29:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 27 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Pay_WorkTimesBillList.aspx.cs | 17 +
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_QiaoYi_PDA.html | 3
WebTM/views/grf/考勤汇报单.grf | 714 +++++++++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html | 4
WebTM/views/基础资料/公用基础资料/xmlLBM_Pay_WorkTimesBillList.aspx | 27 +
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/基础资料/公用基础资料/xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs | 26 +
WebTM/WebTM.csproj | 8
10 files changed, 828 insertions(+), 5 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 37c952c..1779acd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -324,6 +324,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
@@ -1805,6 +1806,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.cs">
<DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f9bb972..922b73b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ 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:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
index 8839527..0412801 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_QiaoYi_PDA.html"
@@ -405,7 +405,8 @@
, limit: 3000
, totalRow: true
, cols: [[
- { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ { field: '鍖呭彿', title: '鍖呭彿', width: 80 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
, { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
, { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 220 }
diff --git "a/WebTM/views/grf/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225.grf" "b/WebTM/views/grf/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225.grf"
new file mode 100644
index 0000000..ac9efc4
--- /dev/null
+++ "b/WebTM/views/grf/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225.grf"
@@ -0,0 +1,714 @@
+锘縶
+ "Version":"6.0.0.6",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Height":29.7,
+ "Oriention":"Landscape",
+ "LeftMargin":1,
+ "TopMargin":1,
+ "RightMargin":1,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy/MM/dd"
+ },
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"閮ㄩ棬"
+ },
+ {
+ "Name":"鐝粍"
+ },
+ {
+ "Name":"琛ㄥご澶囨敞"
+ },
+ {
+ "Name":"鑱屽憳"
+ },
+ {
+ "Name":"鑱屽憳绯绘暟"
+ },
+ {
+ "Name":"涓婂崍宸ユ椂"
+ },
+ {
+ "Name":"涓嬪崍宸ユ椂"
+ },
+ {
+ "Name":"鍩烘湰宸ユ椂"
+ },
+ {
+ "Name":"鍩烘湰澶╂暟"
+ },
+ {
+ "Name":"鍔犵彮宸ユ椂"
+ },
+ {
+ "Name":"鍔犵彮澶╂暟"
+ },
+ {
+ "Name":"璇峰亣宸ユ椂"
+ },
+ {
+ "Name":"璇峰亣澶╂暟"
+ },
+ {
+ "Name":"杩熷埌娆℃暟"
+ },
+ {
+ "Name":"杩熷埌鏃堕棿"
+ },
+ {
+ "Name":"鏃╅��娆℃暟"
+ },
+ {
+ "Name":"鏃╅��鏃堕棿"
+ },
+ {
+ "Name":"绉佸嚭娆℃暟"
+ },
+ {
+ "Name":"绉佸嚭鏃堕棿"
+ },
+ {
+ "Name":"鍏嚭娆℃暟"
+ },
+ {
+ "Name":"鍏嚭鏃堕棿"
+ },
+ {
+ "Name":"鏃峰伐澶╂暟"
+ },
+ {
+ "Name":"鍘備紤"
+ },
+ {
+ "Name":"琛ㄤ綋澶囨敞"
+ },
+ {
+ "Name":"鍒跺崟浜�"
+ },
+ {
+ "Name":"鍒跺崟鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy/MM/dd HH:mm:ss"
+ },
+ {
+ "Name":"瀹℃牳浜�"
+ },
+ {
+ "Name":"瀹℃牳鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy/MM/dd HH:mm:ss"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"搴忓彿",
+ "Width":1.16417
+ },
+ {
+ "Name":"鏌撴枡鍔╁墏鍚嶇О",
+ "Width":2
+ },
+ {
+ "Name":"鐢ㄩ噺%",
+ "Width":1.79917
+ },
+ {
+ "Name":"閲嶉噺",
+ "Width":1
+ },
+ {
+ "Name":"鍗曚綅",
+ "Width":1
+ },
+ {
+ "Name":"澶囨敞",
+ "Width":1
+ },
+ {
+ "Name":"Column6",
+ "Width":1
+ },
+ {
+ "Name":"Column1",
+ "Width":1
+ },
+ {
+ "Name":"Column2",
+ "Width":1
+ },
+ {
+ "Name":"Column3",
+ "Width":1
+ },
+ {
+ "Name":"Column4",
+ "Width":1
+ },
+ {
+ "Name":"Column5",
+ "Width":1
+ },
+ {
+ "Name":"Column7",
+ "Width":1
+ },
+ {
+ "Name":"Column8",
+ "Width":1
+ },
+ {
+ "Name":"Column9",
+ "Width":0.978958
+ },
+ {
+ "Name":"Column10",
+ "Width":1
+ },
+ {
+ "Name":"Column11",
+ "Width":1
+ },
+ {
+ "Name":"Column12",
+ "Width":1
+ },
+ {
+ "Name":"Column13",
+ "Width":1
+ },
+ {
+ "Name":"Column14",
+ "Width":1
+ },
+ {
+ "Name":"Column15",
+ "Width":1
+ },
+ {
+ "Name":"Column16",
+ "Width":4
+ }
+ ],
+ "ColumnContent":{
+ "Height":0.79375,
+ "ColumnContentCell":[
+ {
+ "Column":"搴忓彿",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox1",
+ "Dock":"Fill",
+ "ShrinkFontToFit":true,
+ "TextAlign":"MiddleCenter",
+ "SystemVar":"RowNo"
+ }
+ ]
+ },
+ {
+ "Column":"鏌撴枡鍔╁墏鍚嶇О",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Dock":"Fill",
+ "ShrinkFontToFit":true,
+ "TextAlign":"MiddleCenter",
+ "DataField":"鑱屽憳"
+ }
+ ]
+ },
+ {
+ "Column":"鐢ㄩ噺%",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox7",
+ "Dock":"Fill",
+ "ShrinkFontToFit":true,
+ "TextAlign":"MiddleCenter",
+ "DataField":"鑱屽憳绯绘暟"
+ }
+ ]
+ },
+ {
+ "Column":"閲嶉噺",
+ "ShrinkFontToFit":true,
+ "DataField":"涓婂崍宸ユ椂"
+ },
+ {
+ "Column":"鍗曚綅",
+ "ShrinkFontToFit":true,
+ "DataField":"涓嬪崍宸ユ椂"
+ },
+ {
+ "Column":"澶囨敞",
+ "ShrinkFontToFit":true,
+ "DataField":"鍩烘湰宸ユ椂"
+ },
+ {
+ "Column":"Column6",
+ "ShrinkFontToFit":true,
+ "DataField":"鍩烘湰澶╂暟"
+ },
+ {
+ "Column":"Column1",
+ "ShrinkFontToFit":true,
+ "DataField":"鍔犵彮宸ユ椂"
+ },
+ {
+ "Column":"Column2",
+ "ShrinkFontToFit":true,
+ "DataField":"鍔犵彮澶╂暟"
+ },
+ {
+ "Column":"Column3",
+ "ShrinkFontToFit":true,
+ "DataField":"璇峰亣宸ユ椂"
+ },
+ {
+ "Column":"Column4",
+ "ShrinkFontToFit":true,
+ "DataField":"鍔犵彮澶╂暟"
+ },
+ {
+ "Column":"Column5",
+ "ShrinkFontToFit":true,
+ "DataField":"杩熷埌娆℃暟"
+ },
+ {
+ "Column":"Column7",
+ "ShrinkFontToFit":true,
+ "DataField":"杩熷埌鏃堕棿"
+ },
+ {
+ "Column":"Column8",
+ "ShrinkFontToFit":true,
+ "DataField":"鏃╅��娆℃暟"
+ },
+ {
+ "Column":"Column9",
+ "ShrinkFontToFit":true,
+ "DataField":"鏃╅��鏃堕棿"
+ },
+ {
+ "Column":"Column10",
+ "ShrinkFontToFit":true,
+ "DataField":"绉佸嚭娆℃暟"
+ },
+ {
+ "Column":"Column11",
+ "ShrinkFontToFit":true,
+ "DataField":"绉佸嚭鏃堕棿"
+ },
+ {
+ "Column":"Column12",
+ "ShrinkFontToFit":true,
+ "DataField":"鍏嚭娆℃暟"
+ },
+ {
+ "Column":"Column13",
+ "ShrinkFontToFit":true,
+ "DataField":"鍏嚭鏃堕棿"
+ },
+ {
+ "Column":"Column14",
+ "ShrinkFontToFit":true,
+ "DataField":"鏃峰伐澶╂暟"
+ },
+ {
+ "Column":"Column15",
+ "ShrinkFontToFit":true,
+ "DataField":"鍘備紤"
+ },
+ {
+ "Column":"Column16",
+ "ShrinkFontToFit":true,
+ "DataField":"琛ㄤ綋澶囨敞"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":1.00542,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"搴忓彿",
+ "TextAlign":"MiddleCenter",
+ "Text":"搴忓彿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鏌撴枡鍔╁墏鍚嶇О",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鑱屽憳"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鐢ㄩ噺%",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鑱屽憳绯绘暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"閲嶉噺",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"涓婂崍宸ユ椂"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鍗曚綅",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"涓嬪崍宸ユ椂"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"澶囨敞",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鍩烘湰宸ユ椂"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column6",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鍩烘湰澶╂暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鍔犵彮宸ユ椂"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鍔犵彮澶╂暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"璇峰亣宸ユ椂"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column4",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"璇峰亣澶╂暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column5",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"杩熷埌娆℃暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column7",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"杩熷埌鏃堕棿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column8",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鏃╅��娆℃暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column9",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鏃╅��鏃堕棿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column10",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"绉佸嚭娆℃暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column11",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"绉佸嚭鏃堕棿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column12",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鍏嚭娆℃暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column13",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鍏嚭鏃堕棿"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column14",
+ "WordWrap":true,
+ "TextAlign":"MiddleCenter",
+ "Text":"鏃峰伐澶╂暟"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column15",
+ "TextAlign":"MiddleCenter",
+ "Text":"鍘備紤"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column16",
+ "TextAlign":"MiddleCenter",
+ "Text":"澶囨敞"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":4.20688,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid1",
+ "Left":2.2225,
+ "Top":1.5875,
+ "ColumnCount":4,
+ "RowCount":3,
+ "ShowColLine":false,
+ "ShowRowLine":false,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":2.03729
+ },
+ {
+ "index":2,
+ "Width":7.43479
+ },
+ {
+ "index":3,
+ "Width":1.95792
+ },
+ {
+ "index":4,
+ "Width":11.139
+ }
+ ],
+ "FreeGridRow":[
+ {
+ "index":1,
+ "Height":0.7
+ },
+ {
+ "index":2,
+ "Height":0.7
+ },
+ {
+ "index":3,
+ "Height":0.7
+ }
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"鏃ユ湡锛�"
+ },
+ {
+ "row":1,
+ "col":2,
+ "Text":"[#鏃ユ湡#]"
+ },
+ {
+ "row":1,
+ "col":3,
+ "Text":"鍗曟嵁鍙凤細"
+ },
+ {
+ "row":1,
+ "col":4,
+ "Text":"[#鍗曟嵁鍙�#]"
+ },
+ {
+ "row":2,
+ "col":1,
+ "Text":"閮ㄩ棬锛�"
+ },
+ {
+ "row":2,
+ "col":2,
+ "Text":"[#閮ㄩ棬#]"
+ },
+ {
+ "row":2,
+ "col":3,
+ "Text":"鐝粍锛�"
+ },
+ {
+ "row":2,
+ "col":4,
+ "Text":"[#鐝粍#]"
+ },
+ {
+ "row":3,
+ "col":1,
+ "Text":"琛ㄥご澶囨敞锛�"
+ },
+ {
+ "row":3,
+ "col":2,
+ "Text":"[#琛ㄥご澶囨敞#]",
+ "ColSpan":3
+ }
+ ]
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":7.99042,
+ "Top":0.396875,
+ "Width":6.00604,
+ "Height":0.79375,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":142500,
+ "Weight":400,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鑰冨嫟姹囨姤鍗�"
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":1.19063,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid2",
+ "Left":1.42875,
+ "Top":0.264583,
+ "ColumnCount":8,
+ "RowCount":1,
+ "ShowColLine":false,
+ "ShowRowLine":false,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":2
+ },
+ {
+ "index":3,
+ "Width":2
+ },
+ {
+ "index":4,
+ "Width":5
+ },
+ {
+ "index":5,
+ "Width":2
+ },
+ {
+ "index":7,
+ "Width":2.01083
+ },
+ {
+ "index":8,
+ "Width":5
+ }
+ ],
+ "FreeGridRow":[
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"鍒跺崟浜猴細"
+ },
+ {
+ "row":1,
+ "col":2,
+ "Text":"[#鍒跺崟浜�#]"
+ },
+ {
+ "row":1,
+ "col":3,
+ "Text":"鍒跺崟鏃ユ湡锛�"
+ },
+ {
+ "row":1,
+ "col":4,
+ "Text":"[#鍒跺崟鏃ユ湡#]"
+ },
+ {
+ "row":1,
+ "col":5,
+ "Text":"瀹℃牳浜猴細"
+ },
+ {
+ "row":1,
+ "col":6,
+ "Text":"[#瀹℃牳浜�#]"
+ },
+ {
+ "row":1,
+ "col":7,
+ "Text":"瀹℃牳鏃ユ湡锛�"
+ },
+ {
+ "row":1,
+ "col":8,
+ "Text":"[#瀹℃牳鏃ユ湡#]"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
index 3d6a03c..f62d98c 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
@@ -385,9 +385,9 @@
});
return;
}
- if (sHQty == "" || sHQty ==0) {
+ if (sHQty == "" || sHQty <= 0 || sHQty > 100) {
playSound();
- layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", {
+ layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛屽ぇ浜�100锛岃閲嶆柊杈撳叆鏁伴噺锛�", {
icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HQty").select();
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 08e2d58..ad01a81 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"
@@ -248,6 +248,9 @@
case "PM_WorkTaskBillMyList": //鎴戠殑浠诲姟
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlPM_WorkTaskBillMyList.aspx?linterid=" + value, true, "");
break;
+ case "Pay_WorkTimesBillList": //鑰冨嫟姹囨姤鍗曞垪琛�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Pay_WorkTimesBillList.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_Pay_WorkTimesBillList.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_Pay_WorkTimesBillList.aspx"
new file mode 100644
index 0000000..81d8fce
--- /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_Pay_WorkTimesBillList.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Pay_WorkTimesBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Pay_WorkTimesBillList" %>
+
+<!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_Pay_WorkTimesBillList where hmainid=" + Request.Params["linterid"] + " order by hmainid desc");
+ }
+ </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_Pay_WorkTimesBillList.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_Pay_WorkTimesBillList.aspx.cs"
new file mode 100644
index 0000000..32d1179
--- /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_Pay_WorkTimesBillList.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_Pay_WorkTimesBillList : 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_Pay_WorkTimesBillList.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_Pay_WorkTimesBillList.aspx.designer.cs"
new file mode 100644
index 0000000..9ab8d44
--- /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_Pay_WorkTimesBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Pay_WorkTimesBillList
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index 7c33cf2..151160f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -99,6 +99,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Print" id="btn_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -314,6 +315,9 @@
//瀵煎嚭鎸夐挳
case 'btn_Export': btn_Export();
break;
+ //鎵撳嵃鎸夐挳
+ case 'btn_Print': get_PrintReport();
+ break;
//鏂板鎸夐挳
case 'btn_Add': btn_Add();
break;
@@ -371,6 +375,29 @@
}
//#endregion
+ //#region 鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length === 1) {
+ 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=' + HModName, 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //#endregion
+
//#region 鏂板
function btn_Add() {
layer.open({
--
Gitblit v1.9.1