From 91568461f8fe6a21fcd4c2beb851e5b0bff312ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 8 Apr 2020 23:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/css/in_out.css | 12 +++
erp_web/js/pages/materials/add_temp.js | 21 +++--
erp_web/pages/manage/customer.html | 36 ++++-----
erp_web/pages/manage/member.html | 36 ++++-----
erp_web/pages/manage/vendor.html | 36 ++++-----
.../pages/materials/purchase_back_list.html | 16 ++--
erp_web/pages/materials/purchase_in_list.html | 16 ++--
erp_web/pages/materials/sale_back_list.html | 18 ++---
erp_web/pages/materials/sale_orders_list.html | 2 +-
erp_web/pages/materials/sale_out_list.html | 18 ++---
erp_web/pages/template/base.html | 81 +++++++++----------
11 files changed, 157 insertions(+), 135 deletions(-)
diff --git a/erp_web/css/in_out.css b/erp_web/css/in_out.css
index 0963b308..31b59a82 100644
--- a/erp_web/css/in_out.css
+++ b/erp_web/css/in_out.css
@@ -131,4 +131,16 @@
height: 30px;
border: 1px solid #95B8E7;
border-radius:5px;
+}
+
+#depotHeadAccountDlg .radius-ui{
+ height: 30px;
+ border: 1px solid #95B8E7;
+ border-radius:5px;
+}
+
+#otherMoneyDlg .radius-ui{
+ height: 30px;
+ border: 1px solid #95B8E7;
+ border-radius:5px;
}
\ No newline at end of file
diff --git a/erp_web/js/pages/materials/add_temp.js b/erp_web/js/pages/materials/add_temp.js
index 23a6ef5f..3268b7d1 100644
--- a/erp_web/js/pages/materials/add_temp.js
+++ b/erp_web/js/pages/materials/add_temp.js
@@ -1,4 +1,4 @@
-$.get("../../pages/template/base.html?7890", function(tem) {
+$.get("../../pages/template/base.html?7891", function(tem) {
if(tem) {
var template = Handlebars.compile(tem);
/**
@@ -13,23 +13,30 @@ $.get("../../pages/template/base.html?7890", function(tem) {
collapsible: false,
closable: true
});
- $("#supplierDlg #supplier").validatebox({
+ $("#supplierDlg #supplier").textbox({
required: true,
validType: 'length[2,30]'
});
- $("#supplierDlg #email").validatebox({
+ $("#supplierDlg #email").textbox({
validType: 'email'
});
$("#BeginNeedGet,#BeginNeedPay,#AllNeedGet,#AllNeedPay").numberbox({
min:0,
precision:2
});
+ $("#taxRate").textbox({
+ validType: 'length[1,2]'
+ });
$("#saveSupplier").linkbutton({
iconCls: 'icon-ok'
});
$("#cancelSupplier").linkbutton({
iconCls: 'icon-cancel'
});
+ $("#contacts,#telephone,#email,#phonenum,#fax,#taxNum,#bankName,#accountNumber,#address").textbox();
+ $("#description").textbox({
+ multiline:true
+ });
/**
* 加载仓库
@@ -43,7 +50,7 @@ $.get("../../pages/template/base.html?7890", function(tem) {
collapsible: false,
closable: true
});
- $("#depotDlg #name,#depotDlg #address").validatebox({
+ $("#depotDlg #name,#depotDlg #address").textbox({
required: true,
validType: 'length[2,30]'
});
@@ -57,6 +64,10 @@ $.get("../../pages/template/base.html?7890", function(tem) {
$("#cancelDepot").linkbutton({
iconCls: 'icon-cancel'
});
+ $("#sort").textbox();
+ $("#depotDlg #remark").textbox({
+ multiline:true
+ });
/**
* 加载账户
@@ -70,7 +81,7 @@ $.get("../../pages/template/base.html?7890", function(tem) {
collapsible: false,
closable: true
});
- $("#accountDlg #name,#accountDlg #serialNo").validatebox({
+ $("#accountDlg #name,#accountDlg #serialNo").textbox({
required: true,
validType: 'length[2,30]'
});
diff --git a/erp_web/pages/manage/customer.html b/erp_web/pages/manage/customer.html
index 6533fde4..f20cf430 100644
--- a/erp_web/pages/manage/customer.html
+++ b/erp_web/pages/manage/customer.html
@@ -58,89 +58,89 @@
diff --git a/erp_web/pages/manage/member.html b/erp_web/pages/manage/member.html
index 65150268..b22c656d 100644
--- a/erp_web/pages/manage/member.html
+++ b/erp_web/pages/manage/member.html
@@ -58,89 +58,89 @@
diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html
index e93b38a8..7a79edd4 100644
--- a/erp_web/pages/manage/vendor.html
+++ b/erp_web/pages/manage/vendor.html
@@ -58,89 +58,89 @@
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html
index 8e04a549..5d6c3ee0 100644
--- a/erp_web/pages/materials/purchase_back_list.html
+++ b/erp_web/pages/materials/purchase_back_list.html
@@ -228,15 +228,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
@@ -254,15 +254,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index 5c1f6239..022b0b6c 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -244,15 +244,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
@@ -270,15 +270,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html
index b28f13a5..f0a6e8d1 100644
--- a/erp_web/pages/materials/sale_back_list.html
+++ b/erp_web/pages/materials/sale_back_list.html
@@ -128,7 +128,7 @@
销售人员 |
-
+
|
|
@@ -228,15 +228,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
@@ -254,15 +254,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html
index 54a44c62..fddb36b6 100644
--- a/erp_web/pages/materials/sale_orders_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -82,7 +82,7 @@
销售人员 |
-
+
|
|
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index c9f0a80a..27f3f4e3 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -142,7 +142,7 @@
销售人员 |
-
+
|
|
@@ -244,15 +244,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
@@ -270,15 +270,15 @@
|
- 合计： |
- |
+ 合计： |
+ |
diff --git a/erp_web/pages/template/base.html b/erp_web/pages/template/base.html
index 62dc62e8..1415184f 100644
--- a/erp_web/pages/template/base.html
+++ b/erp_web/pages/template/base.html
@@ -4,85 +4,84 @@
@@ -101,37 +100,37 @@
| 仓库名称 |
-
+
|
| 仓库地址 |
-
+
|
| 仓储费 |
- 元/天/KG
+ 元/天/KG
|
| 搬运费 |
- 元
+ 元
|
| 排序 |
-
+
|
| 描述 |
-
+
|
@@ -150,19 +149,19 @@
| 名称 |
-
+
|
| 编号 |
-
+
|
| 期初金额 |
-
+
|