From db004ee1a7569f6e4931f27e5a390f99fa020324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 2 Mar 2020 20:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=80=E6=9C=89=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/css/jsherp.css | 12 +- erp_web/js/common/common.js | 7 +- erp_web/js/pages/manage/supplier.js | 14 +-- erp_web/pages/financial/advance_in.html | 45 ++++---- erp_web/pages/financial/giro.html | 45 ++++---- erp_web/pages/financial/item_in.html | 45 ++++---- erp_web/pages/financial/item_out.html | 45 ++++---- erp_web/pages/financial/money_in.html | 45 ++++---- erp_web/pages/financial/money_out.html | 45 ++++---- erp_web/pages/manage/account.html | 49 +++++---- erp_web/pages/manage/customer.html | 60 +++++----- erp_web/pages/manage/depot.html | 38 ++++--- erp_web/pages/manage/functions.html | 43 +++++--- erp_web/pages/manage/inOutItem.html | 47 ++++---- erp_web/pages/manage/log.html | 104 +++++++++--------- erp_web/pages/manage/member.html | 60 +++++----- erp_web/pages/manage/organization.html | 2 + .../pages/manage/organization_forselect.html | 2 + erp_web/pages/manage/role.html | 34 +++--- erp_web/pages/manage/roleApp.html | 2 + erp_web/pages/manage/roleFunctions.html | 2 + erp_web/pages/manage/rolePushBtn.html | 2 + erp_web/pages/manage/serialNumber.html | 44 +++++--- erp_web/pages/manage/systemConfig.html | 29 ++--- erp_web/pages/manage/unit.html | 27 ++--- erp_web/pages/manage/user.html | 41 ++++--- erp_web/pages/manage/user_forselect.html | 2 + erp_web/pages/manage/vendor.html | 60 +++++----- .../pages/materials/allocation_out_list.html | 55 ++++----- erp_web/pages/materials/assemble_list.html | 55 ++++----- erp_web/pages/materials/bill_detail.html | 2 + erp_web/pages/materials/disassemble_list.html | 55 ++++----- erp_web/pages/materials/material.html | 60 +++++----- erp_web/pages/materials/materialProperty.html | 27 ++--- .../pages/materials/material_forselect.html | 2 + erp_web/pages/materials/materialcategory.html | 2 + .../materials/materialcategory_forselect.html | 2 + erp_web/pages/materials/other_in_list.html | 55 ++++----- erp_web/pages/materials/other_out_list.html | 55 ++++----- erp_web/pages/materials/person.html | 40 +++---- .../pages/materials/purchase_back_list.html | 55 ++++----- erp_web/pages/materials/purchase_in_list.html | 55 ++++----- .../pages/materials/purchase_orders_list.html | 55 ++++----- erp_web/pages/materials/retail_back_list.html | 55 ++++----- erp_web/pages/materials/retail_out_list.html | 55 ++++----- erp_web/pages/materials/sale_back_list.html | 55 ++++----- erp_web/pages/materials/sale_orders_list.html | 55 ++++----- erp_web/pages/materials/sale_out_list.html | 55 ++++----- erp_web/pages/reports/account_report.html | 47 ++++---- erp_web/pages/reports/buy_in_report.html | 36 +++--- erp_web/pages/reports/customer_account.html | 54 +++++---- erp_web/pages/reports/in_detail.html | 54 +++++---- erp_web/pages/reports/in_material_count.html | 54 +++++---- .../pages/reports/in_out_stock_report.html | 42 +++---- erp_web/pages/reports/out_detail.html | 54 +++++---- erp_web/pages/reports/out_material_count.html | 54 +++++---- erp_web/pages/reports/sale_out_report.html | 43 ++++---- .../pages/reports/stock_warning_report.html | 45 +++----- erp_web/pages/reports/vendor_account.html | 54 +++++---- erp_web/pages/user/password.html | 2 + erp_web/pages/user/userCustomer.html | 2 + erp_web/pages/user/userDepot.html | 2 + erp_web/pages/user/userHelp.html | 2 + erp_web/pages/user/userMsg.html | 31 +++--- erp_web/pages/user/userRole.html | 2 + 65 files changed, 1218 insertions(+), 1161 deletions(-) diff --git a/erp_web/css/jsherp.css b/erp_web/css/jsherp.css index 62d3bb44..ad316e44 100644 --- a/erp_web/css/jsherp.css +++ b/erp_web/css/jsherp.css @@ -229,6 +229,10 @@ width: 160px !important } +.width-180 { + width: 180px !important +} + .width-460 { width: 460px !important } @@ -659,14 +663,15 @@ select.form-control { .form-inline .form-group { display: inline-block; - margin-bottom: 10px; + margin-top: 5px; + margin-bottom: 5px; vertical-align: middle; margin-right: 6px } .form-inline .control-label { text-align: right; - font-size: 13px; + font-size: 14px; vertical-align: baseline } @@ -678,7 +683,8 @@ select.form-control { .form-inline .form-control { display: inline-block; - vertical-align: middle + vertical-align: middle; + border: 1px solid #95B8E7; } .form-inline .btn { diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js index 8ae70eeb..e25dc3f3 100644 --- a/erp_web/js/common/common.js +++ b/erp_web/js/common/common.js @@ -66,8 +66,7 @@ webH = document.documentElement.clientHeight; webW = document.documentElement.offsetWidth; widthInfo = $("body").outerWidth() -27; - var mtopH = $("#searchTable").outerHeight(); - var positionH = $("#position").outerHeight(); + var mtopH = $(".box-body").outerHeight(); heightInfo = webH - mtopH - 86; //分页信息修改成 15条 @@ -83,11 +82,11 @@ } } function dgResize() { - var searchTabHeight = $('#searchTable').height(); + var searchTabHeight = $('.box-body').height(); if($('#tableData').length) { $('#tableData').datagrid('resize', { width: $(window).width() - 6, - height: $(window).height() - searchTabHeight -46 + height: $(window).height() - searchTabHeight -43 }); } } diff --git a/erp_web/js/pages/manage/supplier.js b/erp_web/js/pages/manage/supplier.js index 4a7cd6e1..e2a986b8 100644 --- a/erp_web/js/pages/manage/supplier.js +++ b/erp_web/js/pages/manage/supplier.js @@ -546,12 +546,10 @@ //重置按钮 $("#searchResetBtn").unbind().bind({ click:function(){ - $("#searchSupplier").val(""); - $("#searchType").val(""); - $("#searchPhonenum").val(""); - $("#searchTelephone").val(""); - $("#searchDesc").val(""); - + $("#searchSupplier").textbox("clear"); + $("#searchPhonenum").textbox("clear"); + $("#searchTelephone").textbox("clear"); + $("#searchDesc").textbox("clear"); //加载完以后重新初始化 $("#searchBtn").click(); } @@ -563,8 +561,8 @@ //编辑信息 function editSupplier(supplierTotalInfo) { var supplierInfo = supplierTotalInfo.split("AaBb"); - var beginNeedGet = supplierInfo[5]; - var beginNeedPay = supplierInfo[6]; + var beginNeedGet = supplierInfo[5].replace("undefined",""); + var beginNeedPay = supplierInfo[6].replace("undefined",""); var row = { supplier : supplierInfo[1], contacts : supplierInfo[2].replace("undefined",""), diff --git a/erp_web/pages/financial/advance_in.html b/erp_web/pages/financial/advance_in.html index 4099ccdf..1cbf26ab 100644 --- a/erp_web/pages/financial/advance_in.html +++ b/erp_web/pages/financial/advance_in.html @@ -6,6 +6,8 @@ + + @@ -20,29 +22,26 @@
- - - - - - - - - - - -
单据编号： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/financial/giro.html b/erp_web/pages/financial/giro.html index ff630774..15002e06 100644 --- a/erp_web/pages/financial/giro.html +++ b/erp_web/pages/financial/giro.html @@ -6,6 +6,8 @@ + + @@ -20,29 +22,26 @@
- - - - - - - - - - - -
单据编号： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/financial/item_in.html b/erp_web/pages/financial/item_in.html index 8e947304..b1ceb879 100644 --- a/erp_web/pages/financial/item_in.html +++ b/erp_web/pages/financial/item_in.html @@ -6,6 +6,8 @@ + + @@ -20,29 +22,26 @@
- - - - - - - - - - - -
单据编号： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/financial/item_out.html b/erp_web/pages/financial/item_out.html index 7929317c..fe13c037 100644 --- a/erp_web/pages/financial/item_out.html +++ b/erp_web/pages/financial/item_out.html @@ -6,6 +6,8 @@ + + @@ -20,29 +22,26 @@
- - - - - - - - - - - -
单据编号： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/financial/money_in.html b/erp_web/pages/financial/money_in.html index dc278519..16d1d5ea 100644 --- a/erp_web/pages/financial/money_in.html +++ b/erp_web/pages/financial/money_in.html @@ -6,6 +6,8 @@ + + @@ -20,29 +22,26 @@
- - - - - - - - - - - -
单据编号： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/financial/money_out.html b/erp_web/pages/financial/money_out.html index 491e8ab8..d800c41f 100644 --- a/erp_web/pages/financial/money_out.html +++ b/erp_web/pages/financial/money_out.html @@ -6,6 +6,8 @@ + + @@ -20,29 +22,26 @@
- - - - - - - - - - - -
单据编号： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html index e2a60629..9ba0a23a 100644 --- a/erp_web/pages/manage/account.html +++ b/erp_web/pages/manage/account.html @@ -6,6 +6,8 @@ + + @@ -19,29 +21,30 @@
- - - - - - - - - - - - - -
名称： - -  编号： - -  备注： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
+ + @@ -18,34 +20,36 @@
- - - - - - - - - - - - - - - - -
名称： - -  手机号码： - -  联系电话： - -  备注： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
+ + @@ -17,24 +19,24 @@
- - - - - - - - - - -
仓库名称： - -  描述： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html index 82d8671e..17e3fd4c 100644 --- a/erp_web/pages/manage/functions.html +++ b/erp_web/pages/manage/functions.html @@ -6,6 +6,8 @@ + + @@ -17,30 +19,35 @@
- - - - - - - - - - - -
名称： - -  类型:  +
+
+ +
+ +
+
+
+ +
-
  - 查询   - 重置 -
+
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/inOutItem.html b/erp_web/pages/manage/inOutItem.html index 42511af5..add7c2c4 100644 --- a/erp_web/pages/manage/inOutItem.html +++ b/erp_web/pages/manage/inOutItem.html @@ -7,6 +7,8 @@ + + @@ -18,34 +20,35 @@
- - - - - - - - - - - - - -
名称： - -  类型： +
+
+ +
+ +
+
+
+ +
-
 备注： - -   - 查询   - 重置 -
+
+ +
+ +
+ +
+
+
+ 查询  + 重置 +
+
+ + @@ -17,63 +19,61 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
操作模块： - -  操作人员： -  开始时间： - -  操作IP： - -    
操作详情： - -  操作状态： +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
-
 结束时间： - -   - 查询 - 重置 -   
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/organization_forselect.html b/erp_web/pages/manage/organization_forselect.html index 6a8ae2ee..0201d5d6 100644 --- a/erp_web/pages/manage/organization_forselect.html +++ b/erp_web/pages/manage/organization_forselect.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html index 3243efdd..b81d35d6 100644 --- a/erp_web/pages/manage/role.html +++ b/erp_web/pages/manage/role.html @@ -6,6 +6,8 @@ + + @@ -20,24 +22,20 @@
- - - - - - - - - -
角色名称： - -     - 查询   - 重置   - - 分配功能   - 分配按钮 -
+
+
+ +
+ +
+
+
+ 查询  + 重置 + 分配功能   + 分配按钮 +
+
diff --git a/erp_web/pages/manage/roleApp.html b/erp_web/pages/manage/roleApp.html index 3f345a14..433bff35 100644 --- a/erp_web/pages/manage/roleApp.html +++ b/erp_web/pages/manage/roleApp.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/manage/roleFunctions.html b/erp_web/pages/manage/roleFunctions.html index 11cb6eef..a3543125 100644 --- a/erp_web/pages/manage/roleFunctions.html +++ b/erp_web/pages/manage/roleFunctions.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/manage/rolePushBtn.html b/erp_web/pages/manage/rolePushBtn.html index 6413eeb9..773991d8 100644 --- a/erp_web/pages/manage/rolePushBtn.html +++ b/erp_web/pages/manage/rolePushBtn.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index 6b14c2f2..e2343e1c 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -6,6 +6,8 @@ + + @@ -20,24 +22,30 @@
- - - - - - - - - - -
商品名称： - -  序列号： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html index 1bfadd2b..d27f8bb3 100644 --- a/erp_web/pages/manage/systemConfig.html +++ b/erp_web/pages/manage/systemConfig.html @@ -6,6 +6,8 @@ + + @@ -20,19 +22,18 @@
- - - - - - - - -
公司名称： - -    - 查询   -
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
@@ -478,7 +479,7 @@ //重置按钮 $("#searchResetBtn").unbind().bind({ click: function () { - $("#searchCompanyName").val(""); + $("#searchCompanyName").textbox("clear"); //加载完以后重新初始化 $("#searchBtn").click(); } diff --git a/erp_web/pages/manage/unit.html b/erp_web/pages/manage/unit.html index 2ee60a9b..9b141ce5 100644 --- a/erp_web/pages/manage/unit.html +++ b/erp_web/pages/manage/unit.html @@ -6,6 +6,8 @@ + + @@ -17,19 +19,18 @@
- - - - - - - -
计量单位： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html index 43f74a41..440b65cb 100644 --- a/erp_web/pages/manage/user.html +++ b/erp_web/pages/manage/user.html @@ -4,6 +4,8 @@ 用户管理 + + @@ -18,27 +20,24 @@
- - - - - - - - - - -
登录名称： - -  用户姓名： - -   - 查询   - 重置   - 分配角色   - 分配仓库   - 分配客户 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/manage/user_forselect.html b/erp_web/pages/manage/user_forselect.html index 240a9687..e2aac051 100644 --- a/erp_web/pages/manage/user_forselect.html +++ b/erp_web/pages/manage/user_forselect.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html index d6ac2c10..e93b38a8 100644 --- a/erp_web/pages/manage/vendor.html +++ b/erp_web/pages/manage/vendor.html @@ -6,6 +6,8 @@ + + @@ -18,34 +20,36 @@
- - - - - - - - - - - - - - - - -
名称： - -  手机号码： - -  联系电话： - -  备注： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
+ + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html index 2566b623..6df93799 100644 --- a/erp_web/pages/materials/assemble_list.html +++ b/erp_web/pages/materials/assemble_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/bill_detail.html b/erp_web/pages/materials/bill_detail.html index eacf5ce5..a35545b8 100644 --- a/erp_web/pages/materials/bill_detail.html +++ b/erp_web/pages/materials/bill_detail.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html index 47abbf54..4f468670 100644 --- a/erp_web/pages/materials/disassemble_list.html +++ b/erp_web/pages/materials/disassemble_list.html @@ -6,6 +6,8 @@ + + @@ -22,33 +24,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html index 038c4fdb..5137b67d 100644 --- a/erp_web/pages/materials/material.html +++ b/erp_web/pages/materials/material.html @@ -6,6 +6,8 @@ + + @@ -21,37 +23,39 @@
- - - - - - - - - - - - - - - - -
类别： +
+
+ +
-
 品名： - -  规格： - -  型号： - -   - 查询   - 重置 -
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
@@ -206,7 +210,7 @@ -
@@ -17,19 +19,18 @@
- - - - - - - -
名称： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/material_forselect.html b/erp_web/pages/materials/material_forselect.html index 3c87a865..a6724a38 100644 --- a/erp_web/pages/materials/material_forselect.html +++ b/erp_web/pages/materials/material_forselect.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/materials/materialcategory.html b/erp_web/pages/materials/materialcategory.html index 16febbad..7d65caa0 100644 --- a/erp_web/pages/materials/materialcategory.html +++ b/erp_web/pages/materials/materialcategory.html @@ -9,6 +9,8 @@ + + diff --git a/erp_web/pages/materials/materialcategory_forselect.html b/erp_web/pages/materials/materialcategory_forselect.html index 58204d97..cce6828b 100644 --- a/erp_web/pages/materials/materialcategory_forselect.html +++ b/erp_web/pages/materials/materialcategory_forselect.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html index 08d3bc5f..c268e76a 100644 --- a/erp_web/pages/materials/other_in_list.html +++ b/erp_web/pages/materials/other_in_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html index 704d3ac0..ed6535dc 100644 --- a/erp_web/pages/materials/other_out_list.html +++ b/erp_web/pages/materials/other_out_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/person.html b/erp_web/pages/materials/person.html index f44e2533..fe74f478 100644 --- a/erp_web/pages/materials/person.html +++ b/erp_web/pages/materials/person.html @@ -6,6 +6,8 @@ + + @@ -17,30 +19,30 @@
- - - - - - - - - - -
姓名： - -  类型： - + + +
+ +
+ -
  - 查询   - 重置 -
+
+ +
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html index d9543bb0..4417ff47 100644 --- a/erp_web/pages/materials/purchase_back_list.html +++ b/erp_web/pages/materials/purchase_back_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html index 4a22319d..dd52f7d4 100644 --- a/erp_web/pages/materials/purchase_in_list.html +++ b/erp_web/pages/materials/purchase_in_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html index 7e6e7d67..500d6fca 100644 --- a/erp_web/pages/materials/purchase_orders_list.html +++ b/erp_web/pages/materials/purchase_orders_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html index 442d6e72..5864571b 100644 --- a/erp_web/pages/materials/retail_back_list.html +++ b/erp_web/pages/materials/retail_back_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html index 71391982..832be084 100644 --- a/erp_web/pages/materials/retail_out_list.html +++ b/erp_web/pages/materials/retail_out_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html index a62d5cbd..add11d1d 100644 --- a/erp_web/pages/materials/sale_back_list.html +++ b/erp_web/pages/materials/sale_back_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html index ae221a02..d928b34c 100644 --- a/erp_web/pages/materials/sale_orders_list.html +++ b/erp_web/pages/materials/sale_orders_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html index 22582dd5..fdd0848d 100644 --- a/erp_web/pages/materials/sale_out_list.html +++ b/erp_web/pages/materials/sale_out_list.html @@ -6,6 +6,8 @@ + + @@ -23,33 +25,32 @@
- - - - - - - - - - - - - -
单据编号： - - 商品信息： - - 单据日期： - - - - -   - 查询  - 重置 -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + - + +
+
+
+ 查询  + 重置 +
+
diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html index 43877545..06c2c0e6 100644 --- a/erp_web/pages/reports/account_report.html +++ b/erp_web/pages/reports/account_report.html @@ -6,6 +6,8 @@ + + @@ -21,30 +23,27 @@
- - - - - - - - - - - - - -
名称： - -   编号： - -   - 查询 -    - 打印 -   - 当前总余额：0   -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ 查询  + 打印 +
+
+ 当前总余额：0   +
+
diff --git a/erp_web/pages/reports/buy_in_report.html b/erp_web/pages/reports/buy_in_report.html index b026aa66..1a076d25 100644 --- a/erp_web/pages/reports/buy_in_report.html +++ b/erp_web/pages/reports/buy_in_report.html @@ -6,6 +6,8 @@ + + @@ -19,21 +21,19 @@
- - - - - - - -
月份： +
+
+ +
-
  - 查询 -    - 打印 -
+ class="txt Wdate width-160" style="height: 30px;border: 1px solid #95B8E7;border-radius:5px;"/> +
+ +
+ 查询  + 打印 +
+
@@ -114,10 +114,10 @@ } } }, - {title: '进货数量', field: 'InSum', width: 60}, - {title: '进货金额', field: 'InSumPrice', width: 60}, - {title: '退货数量', field: 'OutSum', width: 60}, - {title: '退货金额', field: 'OutSumPrice', width: 60} + {title: '进货数量', field: 'InSum', width: 80}, + {title: '进货金额', field: 'InSumPrice', width: 80}, + {title: '退货数量', field: 'OutSum', width: 80}, + {title: '退货金额', field: 'OutSumPrice', width: 80} ]], onLoadError: function () { $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error'); diff --git a/erp_web/pages/reports/customer_account.html b/erp_web/pages/reports/customer_account.html index 5de01c85..3d6ea2fb 100644 --- a/erp_web/pages/reports/customer_account.html +++ b/erp_web/pages/reports/customer_account.html @@ -6,6 +6,8 @@ + + @@ -21,36 +23,30 @@
- - - - - - - - - - - - - - -
客户： +
+
+ +
-
 单据日期： - - - - -   - 查询 -    - 打印 -   - 期初应收：0   - 期末应收：0（请选择客户） -
+
+ +
+ +
+ + - + +
+
+
+ 查询  + 打印 +
+
+ 期初应收：0   + 期末应收：0（请选择客户） +
+
diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index e48b4c32..1a237b8d 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -6,6 +6,8 @@ + + @@ -21,36 +23,32 @@
- - - - - - - - - - - - - - - -
供应商： +
+
+ +
-
 仓库： + + +
+ +
-
 单据日期： - - - - -   - 查询 -    - 打印 -
+
+ +
+ +
+ + - + +
+
+
+ 查询  + 打印 +
+
diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html index 12c655f0..1d78326a 100644 --- a/erp_web/pages/reports/in_material_count.html +++ b/erp_web/pages/reports/in_material_count.html @@ -6,6 +6,8 @@ + + @@ -19,36 +21,32 @@
- - - - - - - - - - - - - - - -
供应商： +
+
+ +
-
 仓库： + + +
+ +
-
 单据日期： - - - - -   - 查询 -    - 打印 -
+
+ +
+ +
+ + - + +
+
+
+ 查询  + 打印 +
+
diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html index ad022402..a863d900 100644 --- a/erp_web/pages/reports/in_out_stock_report.html +++ b/erp_web/pages/reports/in_out_stock_report.html @@ -6,6 +6,8 @@ + + @@ -19,29 +21,27 @@
- - - - - - - - - - -
仓库： +
+
+ +
-
 月份： + + +
+ +
-
  - 查询 -    - 导出 -    - 打印 -    -
+
+ +
+ 查询 + 导出 + 打印 +    +
+
@@ -355,7 +355,7 @@ if (count.lastIndexOf('.') > -1) { count = count.substring(0, count.lastIndexOf('.') + 3); } - $("#searchTable .total-count").text("本月合计金额:" + count + "元");//本月合计金额 + $("#tablePanel .total-count").text("本月合计金额:" + count + "元");//本月合计金额 } } }, diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index 8839d85e..6f2a0c31 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -6,6 +6,8 @@ + + @@ -21,36 +23,32 @@
- - - - - - - - - - - - - - - -
客户： +
+
+ +
-
 仓库： + + +
+ +
-
 单据日期： - - - - -   - 查询 -    - 打印 -
+
+ +
+ +
+ + - + +
+
+
+ 查询  + 打印 +
+
diff --git a/erp_web/pages/reports/out_material_count.html b/erp_web/pages/reports/out_material_count.html index 1ed6bc1d..ed1081cb 100644 --- a/erp_web/pages/reports/out_material_count.html +++ b/erp_web/pages/reports/out_material_count.html @@ -6,6 +6,8 @@ + + @@ -19,36 +21,32 @@
- - - - - - - - - - - - - - - -
客户： +
+
+ +
-
 仓库： + + +
+ +
-
 单据日期： - - - - -   - 查询 -    - 打印 -
+
+ +
+ +
+ + - + +
+
+
+ 查询  + 打印 +
+
diff --git a/erp_web/pages/reports/sale_out_report.html b/erp_web/pages/reports/sale_out_report.html index 331a958e..d21e4d1e 100644 --- a/erp_web/pages/reports/sale_out_report.html +++ b/erp_web/pages/reports/sale_out_report.html @@ -6,6 +6,8 @@ + + @@ -19,23 +21,22 @@
- - - - - - - - - -
月份： +
+
+ +
-
   - 查询 -    - 打印 - 当前销售总额：0  注：此处包含零售+批发销售
+ class="txt Wdate width-160" style="height: 30px;border: 1px solid #95B8E7;border-radius:5px;"/> +
+ +
+ 查询  + 打印 +
+
+ 当前销售总额：0  注：此处包含零售+批发销售 +
+
@@ -117,11 +118,11 @@ } } }, - {title: '销售数量', field: 'OutSum', width: 60}, - {title: '销售金额', field: 'OutSumPrice', width: 60}, - {title: '退货数量', field: 'InSum', width: 60}, - {title: '退货金额', field: 'InSumPrice', width: 60}, - {title: '实际销售金额', field: 'OutInSumPrice', width: 80} + {title: '销售数量', field: 'OutSum', width: 80}, + {title: '销售金额', field: 'OutSumPrice', width: 80}, + {title: '退货数量', field: 'InSum', width: 80}, + {title: '退货金额', field: 'InSumPrice', width: 80}, + {title: '实际销售金额', field: 'OutInSumPrice', width: 100} ]], onLoadError: function () { diff --git a/erp_web/pages/reports/stock_warning_report.html b/erp_web/pages/reports/stock_warning_report.html index 4d46a204..d523cc88 100644 --- a/erp_web/pages/reports/stock_warning_report.html +++ b/erp_web/pages/reports/stock_warning_report.html @@ -6,6 +6,8 @@ + + @@ -19,24 +21,19 @@
- - - - - - - - -
仓库： +
+
+ +
-
  - 查询 -    - 导出 -    - 打印 -    -
+
+ +
+ 查询 + 导出 + 打印 +
+
@@ -297,18 +294,12 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - var HeadIds = res.data.total; - if (HeadIds > 0) { - if (pageSize === 3000) { - window.location.href = "/depotItem/exportWarningExcel?browserType=" + getOs() + "¤tPage=" + pageNo + "&pageSize=" + pageSize + "&projectId=" + $.trim($("#searchProjectId").val()) ; - } - else { - //获取排序后的产品ID - $("#tableData").datagrid('loadData', res.data.rows); - } + if (pageSize === 3000) { + window.location.href = "/depotItem/exportWarningExcel?browserType=" + getOs() + "¤tPage=" + pageNo + "&pageSize=" + pageSize + "&projectId=" + $.trim($("#searchProjectId").val()) ; } else { - $.messager.alert('查询提示', '无数据！', 'error'); + //获取排序后的产品ID + $("#tableData").datagrid('loadData', res.data.rows); } } }, diff --git a/erp_web/pages/reports/vendor_account.html b/erp_web/pages/reports/vendor_account.html index fcc9c8e8..5bd33d75 100644 --- a/erp_web/pages/reports/vendor_account.html +++ b/erp_web/pages/reports/vendor_account.html @@ -6,6 +6,8 @@ + + @@ -21,36 +23,30 @@
- - - - - - - - - - - - - - -
供应商： +
+
+ +
-
 单据日期： - - - - -   - 查询 -    - 打印 -   - 期初应付：0   - 期末应付：0（请选择供应商） -
+
+ +
+ +
+ + - + +
+
+
+ 查询  + 打印 +
+
+ 期初应收：0   + 期末应收：0（请选择供应商） +
+
diff --git a/erp_web/pages/user/password.html b/erp_web/pages/user/password.html index a8eda666..1d9be132 100644 --- a/erp_web/pages/user/password.html +++ b/erp_web/pages/user/password.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/user/userCustomer.html b/erp_web/pages/user/userCustomer.html index b498a3f9..11de72d3 100644 --- a/erp_web/pages/user/userCustomer.html +++ b/erp_web/pages/user/userCustomer.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/user/userDepot.html b/erp_web/pages/user/userDepot.html index 07c9de8b..be9e23ac 100644 --- a/erp_web/pages/user/userDepot.html +++ b/erp_web/pages/user/userDepot.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/user/userHelp.html b/erp_web/pages/user/userHelp.html index e8972459..ef8b2399 100644 --- a/erp_web/pages/user/userHelp.html +++ b/erp_web/pages/user/userHelp.html @@ -6,6 +6,8 @@ + + diff --git a/erp_web/pages/user/userMsg.html b/erp_web/pages/user/userMsg.html index 3484a32a..a4463fa2 100644 --- a/erp_web/pages/user/userMsg.html +++ b/erp_web/pages/user/userMsg.html @@ -6,6 +6,8 @@ + + @@ -18,19 +20,18 @@
- - - - - - - -
消息标题： - -   - 查询   - 重置 -
+
+
+ +
+ +
+
+
+ 查询   + 重置 +
+
@@ -254,7 +255,7 @@ } function showMsgDetails(pageNo, pageSize) { - var name = $.trim($("#searchMsgTitle").val()); + var name = $.trim($("#searchMsgTitle").textbox("getValue")); $.ajax({ type: "get", url: "/msg/list", @@ -284,7 +285,7 @@ //重置按钮 $("#searchResetBtn").unbind().bind({ click: function () { - $("#searchMsgTitle").val(""); + $("#searchMsgTitle").textbox("clear"); //加载完以后重新初始化 $("#searchBtn").click(); } diff --git a/erp_web/pages/user/userRole.html b/erp_web/pages/user/userRole.html index 1b697afd..056b1f1d 100644 --- a/erp_web/pages/user/userRole.html +++ b/erp_web/pages/user/userRole.html @@ -6,6 +6,8 @@ + +