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 @@ 数据打印 - + diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html index 1e4a47eb..220ad53d 100644 --- a/erp_web/pages/bill/allocation_out_list.html +++ b/erp_web/pages/bill/allocation_out_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html index 7ccfaa33..9ac4f392 100644 --- a/erp_web/pages/bill/assemble_list.html +++ b/erp_web/pages/bill/assemble_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/bill_detail.html b/erp_web/pages/bill/bill_detail.html index 3e46f8d7..f7fcb95e 100644 --- a/erp_web/pages/bill/bill_detail.html +++ b/erp_web/pages/bill/bill_detail.html @@ -8,7 +8,7 @@ - + diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html index 10636ee9..df1700e9 100644 --- a/erp_web/pages/bill/disassemble_list.html +++ b/erp_web/pages/bill/disassemble_list.html @@ -8,7 +8,7 @@ - + @@ -23,7 +23,7 @@ -
+
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html index 8a8a0f0f..cbe1b086 100644 --- a/erp_web/pages/bill/other_in_list.html +++ b/erp_web/pages/bill/other_in_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html index f584091a..1dd3c4b8 100644 --- a/erp_web/pages/bill/other_out_list.html +++ b/erp_web/pages/bill/other_out_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html index e24f88ae..744038e8 100644 --- a/erp_web/pages/bill/purchase_back_list.html +++ b/erp_web/pages/bill/purchase_back_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html index b4c8a931..0b05cc56 100644 --- a/erp_web/pages/bill/purchase_in_list.html +++ b/erp_web/pages/bill/purchase_in_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html index 9bd2e6e0..a6e35ade 100644 --- a/erp_web/pages/bill/purchase_orders_list.html +++ b/erp_web/pages/bill/purchase_orders_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html index 85761bdb..9f851fc9 100644 --- a/erp_web/pages/bill/retail_back_list.html +++ b/erp_web/pages/bill/retail_back_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html index acd9004b..84ab0265 100644 --- a/erp_web/pages/bill/retail_out_list.html +++ b/erp_web/pages/bill/retail_out_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html index e5451a45..fc559315 100644 --- a/erp_web/pages/bill/sale_back_list.html +++ b/erp_web/pages/bill/sale_back_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html index f6fb00cc..00185db4 100644 --- a/erp_web/pages/bill/sale_orders_list.html +++ b/erp_web/pages/bill/sale_orders_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html index 6bd66080..1ba8d65a 100644 --- a/erp_web/pages/bill/sale_out_list.html +++ b/erp_web/pages/bill/sale_out_list.html @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ -
+
diff --git a/erp_web/pages/financial/advance_in.html b/erp_web/pages/financial/advance_in.html index e43049e2..95ff7b11 100644 --- a/erp_web/pages/financial/advance_in.html +++ b/erp_web/pages/financial/advance_in.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/financial/giro.html b/erp_web/pages/financial/giro.html index 7151e726..7f8e3328 100644 --- a/erp_web/pages/financial/giro.html +++ b/erp_web/pages/financial/giro.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/financial/item_in.html b/erp_web/pages/financial/item_in.html index 8088739a..ba1fc72e 100644 --- a/erp_web/pages/financial/item_in.html +++ b/erp_web/pages/financial/item_in.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/financial/item_out.html b/erp_web/pages/financial/item_out.html index 03f9991e..3921d6e5 100644 --- a/erp_web/pages/financial/item_out.html +++ b/erp_web/pages/financial/item_out.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/financial/money_in.html b/erp_web/pages/financial/money_in.html index 7f2fcf0b..4aeca790 100644 --- a/erp_web/pages/financial/money_in.html +++ b/erp_web/pages/financial/money_in.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/financial/money_out.html b/erp_web/pages/financial/money_out.html index 6d0b05d7..8d4b9615 100644 --- a/erp_web/pages/financial/money_out.html +++ b/erp_web/pages/financial/money_out.html @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html index 3215ffb6..e36a1607 100644 --- a/erp_web/pages/manage/account.html +++ b/erp_web/pages/manage/account.html @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@ -
+
diff --git a/erp_web/pages/manage/customer.html b/erp_web/pages/manage/customer.html index aed7bd30..d8f25378 100644 --- a/erp_web/pages/manage/customer.html +++ b/erp_web/pages/manage/customer.html @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html index cf2698b7..ea6c219b 100644 --- a/erp_web/pages/manage/depot.html +++ b/erp_web/pages/manage/depot.html @@ -8,7 +8,7 @@ - + @@ -18,7 +18,7 @@ -
+
diff --git a/erp_web/pages/manage/functions.html b/erp_web/pages/manage/functions.html index 9feefead..d3e1f847 100644 --- a/erp_web/pages/manage/functions.html +++ b/erp_web/pages/manage/functions.html @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/manage/inOutItem.html b/erp_web/pages/manage/inOutItem.html index 59368053..5fb5a90f 100644 --- a/erp_web/pages/manage/inOutItem.html +++ b/erp_web/pages/manage/inOutItem.html @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/manage/log.html b/erp_web/pages/manage/log.html index 6eb40b10..bf7c0238 100644 --- a/erp_web/pages/manage/log.html +++ b/erp_web/pages/manage/log.html @@ -8,7 +8,7 @@ - + @@ -18,7 +18,7 @@ -
+
diff --git a/erp_web/pages/manage/member.html b/erp_web/pages/manage/member.html index e3cebaba..2597820b 100644 --- a/erp_web/pages/manage/member.html +++ b/erp_web/pages/manage/member.html @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/manage/organization.html b/erp_web/pages/manage/organization.html index 0152ea00..ac400bfb 100644 --- a/erp_web/pages/manage/organization.html +++ b/erp_web/pages/manage/organization.html @@ -12,7 +12,7 @@ - + @@ -22,7 +22,7 @@ -
+
diff --git a/erp_web/pages/manage/organization_forselect.html b/erp_web/pages/manage/organization_forselect.html index 0201d5d6..0acf46f6 100644 --- a/erp_web/pages/manage/organization_forselect.html +++ b/erp_web/pages/manage/organization_forselect.html @@ -9,7 +9,7 @@ - + diff --git a/erp_web/pages/manage/person.html b/erp_web/pages/manage/person.html index a40db30b..1259064f 100644 --- a/erp_web/pages/manage/person.html +++ b/erp_web/pages/manage/person.html @@ -9,7 +9,7 @@ - + @@ -18,7 +18,7 @@ -
+
diff --git a/erp_web/pages/manage/plugin.html b/erp_web/pages/manage/plugin.html index 201d6a43..6c126183 100644 --- a/erp_web/pages/manage/plugin.html +++ b/erp_web/pages/manage/plugin.html @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@ -
+
diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html index 197afe99..7bc58bab 100644 --- a/erp_web/pages/manage/role.html +++ b/erp_web/pages/manage/role.html @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/manage/roleFunctions.html b/erp_web/pages/manage/roleFunctions.html index 0299ffb3..65e01bf9 100644 --- a/erp_web/pages/manage/roleFunctions.html +++ b/erp_web/pages/manage/roleFunctions.html @@ -9,7 +9,7 @@ - + diff --git a/erp_web/pages/manage/rolePushBtn.html b/erp_web/pages/manage/rolePushBtn.html index c033a9c5..cbfd2269 100644 --- a/erp_web/pages/manage/rolePushBtn.html +++ b/erp_web/pages/manage/rolePushBtn.html @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@
-
diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index 3a3ab1fb..c0e9647b 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -9,7 +9,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html index b53a30a4..96aa2686 100644 --- a/erp_web/pages/manage/systemConfig.html +++ b/erp_web/pages/manage/systemConfig.html @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ -
+
diff --git a/erp_web/pages/manage/unit.html b/erp_web/pages/manage/unit.html index 97b125ec..303a51dc 100644 --- a/erp_web/pages/manage/unit.html +++ b/erp_web/pages/manage/unit.html @@ -8,7 +8,7 @@ - + @@ -18,7 +18,7 @@ -
+
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html index 9ba2e063..9481c01f 100644 --- a/erp_web/pages/manage/user.html +++ b/erp_web/pages/manage/user.html @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/manage/user_forselect.html b/erp_web/pages/manage/user_forselect.html index e2aac051..5b54a561 100644 --- a/erp_web/pages/manage/user_forselect.html +++ b/erp_web/pages/manage/user_forselect.html @@ -9,7 +9,7 @@ - + diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html index 50559239..74a07679 100644 --- a/erp_web/pages/manage/vendor.html +++ b/erp_web/pages/manage/vendor.html @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html index a61816f2..204c8415 100644 --- a/erp_web/pages/materials/material.html +++ b/erp_web/pages/materials/material.html @@ -9,7 +9,7 @@ - + @@ -23,7 +23,7 @@ -
+
diff --git a/erp_web/pages/materials/materialProperty.html b/erp_web/pages/materials/materialProperty.html index d4227623..9766a232 100644 --- a/erp_web/pages/materials/materialProperty.html +++ b/erp_web/pages/materials/materialProperty.html @@ -9,7 +9,7 @@ - + @@ -18,7 +18,7 @@ -
+
diff --git a/erp_web/pages/materials/material_forselect.html b/erp_web/pages/materials/material_forselect.html index 3277a309..5471345b 100644 --- a/erp_web/pages/materials/material_forselect.html +++ b/erp_web/pages/materials/material_forselect.html @@ -9,7 +9,7 @@ - + @@ -20,7 +20,7 @@ -
diff --git a/erp_web/pages/materials/materialcategory.html b/erp_web/pages/materials/materialcategory.html index 8335e3ab..8b253963 100644 --- a/erp_web/pages/materials/materialcategory.html +++ b/erp_web/pages/materials/materialcategory.html @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ -
diff --git a/erp_web/pages/materials/materialcategory_forselect.html b/erp_web/pages/materials/materialcategory_forselect.html index 7964c20b..540d713a 100644 --- a/erp_web/pages/materials/materialcategory_forselect.html +++ b/erp_web/pages/materials/materialcategory_forselect.html @@ -9,7 +9,7 @@ - + diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html index c4910ab9..9a38426a 100644 --- a/erp_web/pages/reports/account_report.html +++ b/erp_web/pages/reports/account_report.html @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ -
+
diff --git a/erp_web/pages/reports/buy_in_report.html b/erp_web/pages/reports/buy_in_report.html index a9e3904d..0d2e774f 100644 --- a/erp_web/pages/reports/buy_in_report.html +++ b/erp_web/pages/reports/buy_in_report.html @@ -10,7 +10,7 @@ - + @@ -20,13 +20,13 @@ -
+
+ class="txt Wdate width-160" style="height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"/>
diff --git a/erp_web/pages/reports/customer_account.html b/erp_web/pages/reports/customer_account.html index 0b18fc38..4e34e00b 100644 --- a/erp_web/pages/reports/customer_account.html +++ b/erp_web/pages/reports/customer_account.html @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ -
+
diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index 1a237b8d..1cb2c543 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ -
+
@@ -33,7 +33,7 @@
- +
diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html index 1d78326a..1557f690 100644 --- a/erp_web/pages/reports/in_material_count.html +++ b/erp_web/pages/reports/in_material_count.html @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ -
+
@@ -31,7 +31,7 @@
- +
diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html index 79688d15..29688863 100644 --- a/erp_web/pages/reports/in_out_stock_report.html +++ b/erp_web/pages/reports/in_out_stock_report.html @@ -10,7 +10,7 @@ - + @@ -20,12 +20,12 @@ -
+
- +
@@ -44,7 +44,7 @@
+ class="txt Wdate" style="width:180px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"/>
diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index 6f2a0c31..f2b6dca1 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ -
+
@@ -33,7 +33,7 @@
- +
diff --git a/erp_web/pages/reports/out_material_count.html b/erp_web/pages/reports/out_material_count.html index ed1081cb..e39aba85 100644 --- a/erp_web/pages/reports/out_material_count.html +++ b/erp_web/pages/reports/out_material_count.html @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ -
+
@@ -31,7 +31,7 @@
- +
diff --git a/erp_web/pages/reports/sale_out_report.html b/erp_web/pages/reports/sale_out_report.html index 1285926e..01994b02 100644 --- a/erp_web/pages/reports/sale_out_report.html +++ b/erp_web/pages/reports/sale_out_report.html @@ -10,7 +10,7 @@ - + @@ -20,13 +20,13 @@ -
+
+ class="txt Wdate width-160" style="height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"/>
diff --git a/erp_web/pages/reports/stock_warning_report.html b/erp_web/pages/reports/stock_warning_report.html index 53247cf9..04360252 100644 --- a/erp_web/pages/reports/stock_warning_report.html +++ b/erp_web/pages/reports/stock_warning_report.html @@ -10,7 +10,7 @@ - + @@ -20,12 +20,12 @@ -
+
- +
diff --git a/erp_web/pages/reports/vendor_account.html b/erp_web/pages/reports/vendor_account.html index aa829f42..083c251f 100644 --- a/erp_web/pages/reports/vendor_account.html +++ b/erp_web/pages/reports/vendor_account.html @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ -
+
diff --git a/erp_web/pages/user/password.html b/erp_web/pages/user/password.html index 7a8a9868..4bc6d365 100644 --- a/erp_web/pages/user/password.html +++ b/erp_web/pages/user/password.html @@ -8,7 +8,7 @@ - + diff --git a/erp_web/pages/user/userCustomer.html b/erp_web/pages/user/userCustomer.html index 11de72d3..ce833462 100644 --- a/erp_web/pages/user/userCustomer.html +++ b/erp_web/pages/user/userCustomer.html @@ -9,7 +9,7 @@ - + diff --git a/erp_web/pages/user/userDepot.html b/erp_web/pages/user/userDepot.html index be9e23ac..a52fdc73 100644 --- a/erp_web/pages/user/userDepot.html +++ b/erp_web/pages/user/userDepot.html @@ -9,7 +9,7 @@ - + diff --git a/erp_web/pages/user/userHelp.html b/erp_web/pages/user/userHelp.html index d3cde4c1..1688d143 100644 --- a/erp_web/pages/user/userHelp.html +++ b/erp_web/pages/user/userHelp.html @@ -8,7 +8,7 @@ - + diff --git a/erp_web/pages/user/userMsg.html b/erp_web/pages/user/userMsg.html index fbd2ee58..16d2f4f1 100644 --- a/erp_web/pages/user/userMsg.html +++ b/erp_web/pages/user/userMsg.html @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ -
+
diff --git a/erp_web/pages/user/userRole.html b/erp_web/pages/user/userRole.html index 123cb9b9..21af72db 100644 --- a/erp_web/pages/user/userRole.html +++ b/erp_web/pages/user/userRole.html @@ -9,7 +9,7 @@ - +