From 8eda014169c4966591964568e8442f25c0b7a222 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: Fri, 3 May 2019 15:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E7=9A=84?=
=?UTF-8?q?=E7=99=BE=E5=88=86=E5=8F=B7=E5=92=8C=E5=BD=95=E5=85=A5=E7=9A=84?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/js/pages/manage/supplier.js | 2 +-
erp_web/js/pages/materials/in_out.js | 6 ++++++
erp_web/pages/materials/purchase_back_list.html | 4 ++--
erp_web/pages/materials/purchase_in_list.html | 4 ++--
erp_web/pages/materials/purchase_orders_list.html | 4 ++--
erp_web/pages/materials/sale_orders_list.html | 4 ++--
erp_web/pages/materials/sale_out_list.html | 4 ++--
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/erp_web/js/pages/manage/supplier.js b/erp_web/js/pages/manage/supplier.js
index be3ffa31..8ef1b329 100644
--- a/erp_web/js/pages/manage/supplier.js
+++ b/erp_web/js/pages/manage/supplier.js
@@ -76,7 +76,7 @@
{ title: '预付款',field: 'advancein',width:70,align:"center"},
{ title: '期初应收',field: 'beginneedget',width:70,align:"center"},
{ title: '期初应付',field: 'beginneedpay',width:70,align:"center"},
- { title: '税率', field: 'taxrate',width:50,align:"center"},
+ { title: '税率(%)', field: 'taxrate',width:50,align:"center"},
{ title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
return value? "启用":"禁用";
}}
diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index a6c99d2a..4c14f6e1 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1586,13 +1586,16 @@
reject(); //撤销下、刷新商品列表
$("#addOrgan").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','
增加供应商信息');
+ $('#supplierFM').form('clear');
});
$("#addMember").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle',' 增加会员信息');
+ $('#supplierFM').form('clear');
});
$("#addCustomer").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle',' 增加客户信息');
+ $('#supplierFM').form('clear');
});
url = '/depotHead/addDepotHeadAndDetail';
@@ -2628,6 +2631,9 @@
//保存供应商信息
$("#saveSupplier").off("click").on("click",function() {
+ if(validateForm("supplierFM")) {
+ return;
+ }
if(checkSupplierName()){
return;
}
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html
index 03984a42..1615d388 100644
--- a/erp_web/pages/materials/purchase_back_list.html
+++ b/erp_web/pages/materials/purchase_back_list.html
@@ -344,9 +344,9 @@
|
- 税率 |
+ 税率(%) |
-
+
|
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index 76f00421..d6b6b5aa 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -346,9 +346,9 @@
|
|
- 税率 |
+ 税率(%) |
-
+
|
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html
index 06d0038a..af449d7e 100644
--- a/erp_web/pages/materials/purchase_orders_list.html
+++ b/erp_web/pages/materials/purchase_orders_list.html
@@ -265,9 +265,9 @@
|
|
- 税率 |
+ 税率(%) |
-
+
|
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html
index 1ade8048..0b790973 100644
--- a/erp_web/pages/materials/sale_orders_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -267,9 +267,9 @@
|
|
- 税率 |
+ 税率(%) |
-
+
|
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index ee489f4d..fc63c71a 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -348,9 +348,9 @@
|
|
- 税率 |
+ 税率(%) |
-
+
|