From 5892199127305cf7b3db60257671434abcf0737c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <852955+jishenghua@users.noreply.gitee.com> Date: Sun, 3 Mar 2019 23:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/js/pages/financial/financial_base.js | 8 ++++++ erp_web/js/pages/materials/in_out.js | 7 +++++ erp_web/js/print/print.html | 12 ++++----- erp_web/js/print/print_form.html | 26 +++++++++++++++++++ erp_web/pages/financial/advance_in.html | 7 ++++- erp_web/pages/financial/giro.html | 7 ++++- erp_web/pages/financial/item_in.html | 7 ++++- erp_web/pages/financial/item_out.html | 7 ++++- erp_web/pages/financial/money_in.html | 7 ++++- erp_web/pages/financial/money_out.html | 7 ++++- .../pages/materials/allocation_out_list.html | 7 ++++- erp_web/pages/materials/assemble_list.html | 7 ++++- erp_web/pages/materials/disassemble_list.html | 7 ++++- erp_web/pages/materials/other_in_list.html | 7 ++++- erp_web/pages/materials/other_out_list.html | 7 ++++- .../pages/materials/purchase_back_list.html | 7 ++++- erp_web/pages/materials/purchase_in_list.html | 7 ++++- .../pages/materials/purchase_orders_list.html | 7 ++++- erp_web/pages/materials/retail_back_list.html | 7 ++++- erp_web/pages/materials/retail_out_list.html | 7 ++++- erp_web/pages/materials/sale_back_list.html | 7 ++++- erp_web/pages/materials/sale_orders_list.html | 7 ++++- erp_web/pages/materials/sale_out_list.html | 7 ++++- 23 files changed, 161 insertions(+), 25 deletions(-) create mode 100644 erp_web/js/print/print_form.html diff --git a/erp_web/js/pages/financial/financial_base.js b/erp_web/js/pages/financial/financial_base.js index aaffb378..874e4ccd 100644 --- a/erp_web/js/pages/financial/financial_base.js +++ b/erp_web/js/pages/financial/financial_base.js @@ -874,6 +874,14 @@ }); } }); + + //打印单据 + $("#printAccountHeadShow").off("click").on("click",function(){ + var tableString = $("#accountHeadDlgShow").html(); + localStorage.setItem("tableString",tableString); + window.open("../../js/print/print_form.html","location:No;status:No;help:No;dialogWidth:800px;dialogHeight:600px;scroll:auto;"); + }); + //初始化键盘enter事件 $(document).keydown(function(event) { diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index d724634f..cf9395e3 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -2132,6 +2132,13 @@ } }); + //打印单据 + $("#printDepotHeadShow").off("click").on("click",function(){ + var tableString = $("#depotHeadDlgShow").html(); + localStorage.setItem("tableString",tableString); + window.open("../../js/print/print_form.html","location:No;status:No;help:No;dialogWidth:800px;dialogHeight:600px;scroll:auto;"); + }); + //初始化键盘enter事件 $(document).keydown(function(event){ //兼容 IE和firefox 事件 diff --git a/erp_web/js/print/print.html b/erp_web/js/print/print.html index ee802e46..7fa8c511 100644 --- a/erp_web/js/print/print.html +++ b/erp_web/js/print/print.html @@ -3,12 +3,12 @@ 数据打印 diff --git a/erp_web/js/print/print_form.html b/erp_web/js/print/print_form.html new file mode 100644 index 00000000..a948c274 --- /dev/null +++ b/erp_web/js/print/print_form.html @@ -0,0 +1,26 @@ + + + + 数据打印 + + + + + + + + + + + \ No newline at end of file diff --git a/erp_web/pages/financial/advance_in.html b/erp_web/pages/financial/advance_in.html index ef6ddd2a..9cc28e0d 100644 --- a/erp_web/pages/financial/advance_in.html +++ b/erp_web/pages/financial/advance_in.html @@ -105,7 +105,7 @@ onclick="javascript:$('#accountHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -146,5 +146,10 @@
付款会员：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/financial/giro.html b/erp_web/pages/financial/giro.html index bdc06c8d..4bda0463 100644 --- a/erp_web/pages/financial/giro.html +++ b/erp_web/pages/financial/giro.html @@ -109,7 +109,7 @@ onclick="javascript:$('#accountHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -152,5 +152,10 @@
经手人：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/financial/item_in.html b/erp_web/pages/financial/item_in.html index c5bd00a4..87451120 100644 --- a/erp_web/pages/financial/item_in.html +++ b/erp_web/pages/financial/item_in.html @@ -110,7 +110,7 @@ onclick="javascript:$('#accountHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -155,5 +155,10 @@
往来单位：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/financial/item_out.html b/erp_web/pages/financial/item_out.html index 0fb3b409..cc7bdef3 100644 --- a/erp_web/pages/financial/item_out.html +++ b/erp_web/pages/financial/item_out.html @@ -110,7 +110,7 @@ onclick="javascript:$('#accountHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -153,5 +153,10 @@
往来单位：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/financial/money_in.html b/erp_web/pages/financial/money_in.html index 2138430a..d1a07192 100644 --- a/erp_web/pages/financial/money_in.html +++ b/erp_web/pages/financial/money_in.html @@ -106,7 +106,7 @@ onclick="javascript:$('#accountHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -147,5 +147,10 @@
付款单位：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/financial/money_out.html b/erp_web/pages/financial/money_out.html index 43535ae5..cde020a1 100644 --- a/erp_web/pages/financial/money_out.html +++ b/erp_web/pages/financial/money_out.html @@ -105,7 +105,7 @@ onclick="javascript:$('#accountHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -146,5 +146,10 @@
收款单位：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/allocation_out_list.html b/erp_web/pages/materials/allocation_out_list.html index 0b00d089..02924d24 100644 --- a/erp_web/pages/materials/allocation_out_list.html +++ b/erp_web/pages/materials/allocation_out_list.html @@ -100,7 +100,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -131,5 +131,10 @@
单据日期：
+
+ 打印 + 取消 +
\ No newline at end of file diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html index 8c42534a..46ed61d4 100644 --- a/erp_web/pages/materials/assemble_list.html +++ b/erp_web/pages/materials/assemble_list.html @@ -99,7 +99,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -130,5 +130,10 @@
单据日期：
+
+ 打印 + 取消 +
\ No newline at end of file diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html index 456b4a35..556d3f80 100644 --- a/erp_web/pages/materials/disassemble_list.html +++ b/erp_web/pages/materials/disassemble_list.html @@ -105,7 +105,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -136,5 +136,10 @@
单据日期：
+
+ 打印 + 取消 +
\ No newline at end of file diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html index 0aeaecc4..f2f7fbd0 100644 --- a/erp_web/pages/materials/other_in_list.html +++ b/erp_web/pages/materials/other_in_list.html @@ -108,7 +108,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -141,5 +141,10 @@
供应商：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html index a0485ce9..f803864b 100644 --- a/erp_web/pages/materials/other_out_list.html +++ b/erp_web/pages/materials/other_out_list.html @@ -102,7 +102,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -135,5 +135,10 @@
客户：
+
+ 打印 + 取消 +
\ No newline at end of file diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html index 5d86109b..1349e78a 100644 --- a/erp_web/pages/materials/purchase_back_list.html +++ b/erp_web/pages/materials/purchase_back_list.html @@ -150,7 +150,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -221,6 +221,11 @@
供应商：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html index 4aa39100..e1fe1487 100644 --- a/erp_web/pages/materials/purchase_in_list.html +++ b/erp_web/pages/materials/purchase_in_list.html @@ -152,7 +152,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
@@ -224,6 +224,11 @@
供应商：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html index ada1eb90..e7b8507c 100644 --- a/erp_web/pages/materials/purchase_orders_list.html +++ b/erp_web/pages/materials/purchase_orders_list.html @@ -109,7 +109,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
@@ -142,6 +142,11 @@
供应商：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html index c790c583..5e733352 100644 --- a/erp_web/pages/materials/retail_back_list.html +++ b/erp_web/pages/materials/retail_back_list.html @@ -141,7 +141,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
@@ -207,5 +207,10 @@
会员卡号：
+
+ 打印 + 取消 +
\ No newline at end of file diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html index 7a858794..59fe9acb 100644 --- a/erp_web/pages/materials/retail_out_list.html +++ b/erp_web/pages/materials/retail_out_list.html @@ -145,7 +145,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true"> @@ -212,6 +212,11 @@
会员卡号：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html index 5daa34a5..092aa2c0 100644 --- a/erp_web/pages/materials/sale_back_list.html +++ b/erp_web/pages/materials/sale_back_list.html @@ -144,7 +144,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
@@ -217,6 +217,11 @@
客户：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html index 9295ce9f..757474c5 100644 --- a/erp_web/pages/materials/sale_orders_list.html +++ b/erp_web/pages/materials/sale_orders_list.html @@ -103,7 +103,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
@@ -138,6 +138,11 @@
客户：
+
+ 打印 + 取消 +
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html index 27059cc9..54993250 100644 --- a/erp_web/pages/materials/sale_out_list.html +++ b/erp_web/pages/materials/sale_out_list.html @@ -146,7 +146,7 @@ onclick="javascript:$('#depotHeadDlg').dialog('close')">取消
+ closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
@@ -220,6 +220,11 @@
客户：
+
+ 打印 + 取消 +