From abf50e4731fed5918ffeffa31a2c57038ac4ed42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 1 Nov 2020 11:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/css/financial.css | 2 +- erp_web/css/in_out.css | 2 +- erp_web/js/common/common.js | 4 ++-- erp_web/js/easyui/themes/gray/easyui.css | 4 ++-- erp_web/js/print/print_form.html | 2 +- erp_web/pages/bill/allocation_out_list.html | 4 ++-- erp_web/pages/bill/assemble_list.html | 4 ++-- erp_web/pages/bill/bill_detail.html | 2 +- erp_web/pages/bill/disassemble_list.html | 4 ++-- erp_web/pages/bill/other_in_list.html | 4 ++-- erp_web/pages/bill/other_out_list.html | 4 ++-- erp_web/pages/bill/purchase_back_list.html | 4 ++-- erp_web/pages/bill/purchase_in_list.html | 4 ++-- erp_web/pages/bill/purchase_orders_list.html | 4 ++-- erp_web/pages/bill/retail_back_list.html | 4 ++-- erp_web/pages/bill/retail_out_list.html | 4 ++-- erp_web/pages/bill/sale_back_list.html | 4 ++-- erp_web/pages/bill/sale_orders_list.html | 4 ++-- erp_web/pages/bill/sale_out_list.html | 4 ++-- erp_web/pages/financial/advance_in.html | 4 ++-- erp_web/pages/financial/giro.html | 4 ++-- erp_web/pages/financial/item_in.html | 4 ++-- erp_web/pages/financial/item_out.html | 4 ++-- erp_web/pages/financial/money_in.html | 4 ++-- erp_web/pages/financial/money_out.html | 4 ++-- erp_web/pages/manage/account.html | 4 ++-- erp_web/pages/manage/customer.html | 4 ++-- erp_web/pages/manage/depot.html | 4 ++-- erp_web/pages/manage/functions.html | 4 ++-- erp_web/pages/manage/inOutItem.html | 4 ++-- erp_web/pages/manage/log.html | 4 ++-- erp_web/pages/manage/member.html | 4 ++-- erp_web/pages/manage/organization.html | 4 ++-- erp_web/pages/manage/organization_forselect.html | 2 +- erp_web/pages/manage/person.html | 4 ++-- erp_web/pages/manage/plugin.html | 4 ++-- erp_web/pages/manage/role.html | 4 ++-- erp_web/pages/manage/roleFunctions.html | 2 +- erp_web/pages/manage/rolePushBtn.html | 4 ++-- erp_web/pages/manage/serialNumber.html | 4 ++-- erp_web/pages/manage/systemConfig.html | 4 ++-- erp_web/pages/manage/unit.html | 4 ++-- erp_web/pages/manage/user.html | 4 ++-- erp_web/pages/manage/user_forselect.html | 2 +- erp_web/pages/manage/vendor.html | 4 ++-- erp_web/pages/materials/material.html | 4 ++-- erp_web/pages/materials/materialProperty.html | 4 ++-- erp_web/pages/materials/material_forselect.html | 4 ++-- erp_web/pages/materials/materialcategory.html | 4 ++-- erp_web/pages/materials/materialcategory_forselect.html | 2 +- erp_web/pages/reports/account_report.html | 4 ++-- erp_web/pages/reports/buy_in_report.html | 6 +++--- erp_web/pages/reports/customer_account.html | 4 ++-- erp_web/pages/reports/in_detail.html | 6 +++--- erp_web/pages/reports/in_material_count.html | 6 +++--- erp_web/pages/reports/in_out_stock_report.html | 8 ++++---- erp_web/pages/reports/out_detail.html | 6 +++--- erp_web/pages/reports/out_material_count.html | 6 +++--- erp_web/pages/reports/sale_out_report.html | 6 +++--- erp_web/pages/reports/stock_warning_report.html | 6 +++--- erp_web/pages/reports/vendor_account.html | 4 ++-- 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 | 4 ++-- erp_web/pages/user/userRole.html | 2 +- 67 files changed, 130 insertions(+), 130 deletions(-) diff --git a/erp_web/css/financial.css b/erp_web/css/financial.css index 3297e8d4..4c90032e 100644 --- a/erp_web/css/financial.css +++ b/erp_web/css/financial.css @@ -1,5 +1,5 @@ #accountHeadDlg .radius-ui{ height: 30px; - border: 1px solid #95B8E7; + border: 1px solid #d3d3d3; border-radius:5px; } \ No newline at end of file diff --git a/erp_web/css/in_out.css b/erp_web/css/in_out.css index 31b59a82..06abe503 100644 --- a/erp_web/css/in_out.css +++ b/erp_web/css/in_out.css @@ -129,7 +129,7 @@ #depotHeadDlg .radius-ui{ height: 30px; - border: 1px solid #95B8E7; + border: 1px solid #d3d3d3; border-radius:5px; } diff --git a/erp_web/js/common/common.js b/erp_web/js/common/common.js index 7912aec4..488f2904 100644 --- a/erp_web/js/common/common.js +++ b/erp_web/js/common/common.js @@ -85,8 +85,8 @@ var searchTabHeight = $('.box-body').height(); if($('#tableData') && $('#tableData').length && $('#tableData').datagrid()) { $('#tableData').datagrid('resize', { - width: $(window).width() - 6, - height: $(window).height() - searchTabHeight -43 + width: $(window).width() - 13, + height: $(window).height() - searchTabHeight -51 }); } } diff --git a/erp_web/js/easyui/themes/gray/easyui.css b/erp_web/js/easyui/themes/gray/easyui.css index e4794dab..37c7ce2e 100644 --- a/erp_web/js/easyui/themes/gray/easyui.css +++ b/erp_web/js/easyui/themes/gray/easyui.css @@ -2007,8 +2007,8 @@ cursor: default; } .datagrid-row-selected { - background: #0092DC; - color: #fff; + background: #e0e0e0; + color: #000000; } .datagrid-row-editing .textbox, .datagrid-row-editing .textbox-text { diff --git a/erp_web/js/print/print_form.html b/erp_web/js/print/print_form.html index 3e423b56..39695929 100644 --- a/erp_web/js/print/print_form.html +++ b/erp_web/js/print/print_form.html @@ -2,7 +2,7 @@