From b088628cf9be70c36e34032bb0d024548351541b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 三月 2023 17:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js | 86 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
index 86c4666..99665da 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js
@@ -2,7 +2,53 @@
* 初始化详情对话框
*/
var TBranchOfficeInfoDlg = {
- tBranchOfficeInfoData : {}
+ tBranchOfficeInfoData : {},
+ validateFields: {
+ branchOfficeName: {
+ validators: {
+ notEmpty: {
+ message: '分公司名称不能为空'
+ }
+ }
+ },
+ name: {
+ validators: {
+ notEmpty: {
+ message: '负责人姓名不能为空'
+ }
+ }
+ },
+ phone: {
+ validators: {
+ notEmpty: {
+ message: '联系电话不能为空'
+ }
+ }
+ },
+ area: {
+ validators: {
+ notEmpty: {
+ message: '请选择服务区域'
+ }
+ }
+ },
+ emergencyPhone: {
+ validators: {
+ notEmpty: {
+ message: '代理商抽成不能为空'
+ }
+ }
+ },
+ }
+};
+
+/**
+ * 验证数据是否为空
+ */
+TBranchOfficeInfoDlg.validate = function () {
+ $('#branchOfficeInfoForm').data("bootstrapValidator").resetForm();
+ $('#branchOfficeInfoForm').bootstrapValidator('validate');
+ return $("#branchOfficeInfoForm").data('bootstrapValidator').isValid();
};
/**
@@ -56,6 +102,12 @@
.set('cityName')
.set('districtCode')
.set('districtName')
+ .set('branchOfficeName')
+ .set('operatingBusiness')
+ .set('bankDeposit')
+ .set('bankAccount')
+ .set('area')
+ .set('areaId')
.set('status')
.set('createTime');
}
@@ -68,11 +120,20 @@
this.clearData();
this.collectData();
+ if(!this.validate()){
+ return ;
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/add", function(data){
- Feng.success("添加成功!");
- window.parent.TBranchOffice.table.refresh();
- TBranchOfficeInfoDlg.close();
+ if(data.code == 500){
+ Feng.error("添加失败!" + data.message + "!");
+ return false;
+ }else {
+ Feng.success("添加成功!");
+ window.parent.TBranchOffice.table.refresh();
+ TBranchOfficeInfoDlg.close();
+ }
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
@@ -88,11 +149,20 @@
this.clearData();
this.collectData();
+ if(!this.validate()){
+ return ;
+ }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tBranchOffice/update", function(data){
- Feng.success("修改成功!");
- window.parent.TBranchOffice.table.refresh();
- TBranchOfficeInfoDlg.close();
+ if(data.code == 500){
+ Feng.error("修改失败!" + data.message + "!");
+ return false;
+ }else {
+ Feng.success("修改成功!");
+ window.parent.TBranchOffice.table.refresh();
+ TBranchOfficeInfoDlg.close();
+ }
},function(data){
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
@@ -101,5 +171,5 @@
}
$(function() {
-
+ Feng.initValidator("branchOfficeInfoForm", TBranchOfficeInfoDlg.validateFields);
});
--
Gitblit v1.7.1