purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!29 修改几个弹窗样式

Browse Source 
Merge pull request !29 from 乾坤平台/master
This commit is contained in:
乾坤平台
2019-02-22 22:14:02 +08:00
committed by 季圣华
parent bc49df9d72 f08a5c0833
commit 149f78d733
8 changed files with 946 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erp_web/pages/manage/roleApp.html
View File

@@ -77,9 +77,7 @@
else { else {
url = '/userBusiness/update?id=' + id; url = '/userBusiness/update?id=' + id;
} }
$.messager.confirm("提示","您确定要保存吗？",function(data){
if (confirm("您确定要保存吗？")) {
$.ajax({ $.ajax({
url: url, url: url,
type: "post", type: "post",
@@ -95,14 +93,14 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
self.parent.$.colorbox.close(); self.parent.$.colorbox.close();
alert("操作成功！"); $.messager.alert('提示',"操作成功！","info");
} }
else { else {
alert("操作失败！"); $.messager.alert('提示',"操作失败！","error");
} }
} }
}); });
} });
} }
); );
@@ -135,6 +133,7 @@
}); });
return flag; return flag;
} }
</script> </script>
</body> </body>
</html> </html>

11
erp_web/pages/manage/roleFunctions.html
View File

@@ -76,9 +76,7 @@
else { else {
url = '/userBusiness/update?id=' + id; url = '/userBusiness/update?id=' + id;
} }
$.messager.confirm("提示","您确定要保存吗？",function(data){
if (confirm("您确定要保存吗？")) {
$.ajax({ $.ajax({
url: url, url: url,
type: "post", type: "post",
@@ -94,14 +92,15 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
self.parent.$.colorbox.close(); self.parent.$.colorbox.close();
alert("操作成功！"); $.messager.alert('提示',"操作成功！","info");
} }
else { else {
alert("操作失败！"); $.messager.alert('提示',"操作失败！","error");
} }
} }
}); });
}
});
} }
); );

6
erp_web/pages/manage/rolePushBtn.html
View File

@@ -212,7 +212,7 @@
}, 500); }, 500);
$("#btnOK").off("click").on("click", function () { $("#btnOK").off("click").on("click", function () {
if (confirm("您确定要保存吗？")) { $.messager.confirm("提示","您确定要保存吗？",function(data){
var bindList = $("#pushList .datagrid-view2 .datagrid-body .datagrid-row"); var bindList = $("#pushList .datagrid-view2 .datagrid-body .datagrid-row");
var bindArr = []; var bindArr = [];
var btnStr = ""; var btnStr = "";
@@ -239,7 +239,7 @@
success: function (res) { success: function (res) {
if (res && res.code === 200) { if (res && res.code === 200) {
self.parent.$.colorbox.close(); self.parent.$.colorbox.close();
alert("操作成功！"); $.messager.alert('提示',"操作成功！","info");
} }
else { else {
$.messager.show({ $.messager.show({
@@ -253,7 +253,7 @@
return; return;
} }
}); });
} });
}); });
} }
</script> </script>

11
erp_web/pages/user/userCustomer.html
View File

@@ -76,9 +76,7 @@
else { else {
url = '/userBusiness/update?id=' + id; url = '/userBusiness/update?id=' + id;
} }
$.messager.confirm("提示","您确定要保存吗？",function(data){
if (confirm("您确定要保存吗？")) {
$.ajax({ $.ajax({
url: url, url: url,
type: "post", type: "post",
@@ -94,14 +92,15 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
self.parent.$.colorbox.close(); self.parent.$.colorbox.close();
alert("操作成功！"); $.messager.alert('提示',"操作成功！","info");
} }
else { else {
alert("操作失败！"); $.messager.alert('提示',"操作失败！","error");
} }
} }
}); });
}
});
} }
); );

10
erp_web/pages/user/userDepot.html
View File

@@ -76,9 +76,7 @@
else { else {
url = '/userBusiness/update?id=' + id; url = '/userBusiness/update?id=' + id;
} }
$.messager.confirm("提示","您确定要保存吗？",function(data){
if (confirm("您确定要保存吗？")) {
$.ajax({ $.ajax({
url: url, url: url,
type: "post", type: "post",
@@ -94,14 +92,14 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
self.parent.$.colorbox.close(); self.parent.$.colorbox.close();
alert("操作成功！"); $.messager.alert('提示',"操作成功！","info");
} }
else { else {
alert("操作失败！"); $.messager.alert('提示',"操作失败！","error");
} }
} }
}); });
} });
} }
); );

10
erp_web/pages/user/userRole.html
View File

@@ -76,9 +76,7 @@
else { else {
url = '/userBusiness/update?id=' + id; url = '/userBusiness/update?id=' + id;
} }
$.messager.confirm("提示","您确定要保存吗？",function(data){
if (confirm("您确定要保存吗？")) {
$.ajax({ $.ajax({
url: url, url: url,
type: "post", type: "post",
@@ -94,14 +92,14 @@
success: function (res) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200) {
self.parent.$.colorbox.close(); self.parent.$.colorbox.close();
alert("操作成功！"); $.messager.alert('提示',"操作成功！","info");
} }
else { else {
alert("操作失败！"); $.messager.alert('提示',"操作失败！","error");
} }
} }
}); });
} });
} }
); );

2
src/main/resources/application.properties
View File

@@ -2,7 +2,7 @@ server.port=8080
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
spring.datasource.driverClassName=com.mysql.jdbc.Driver spring.datasource.driverClassName=com.mysql.jdbc.Driver
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=1234 spring.datasource.password=123456
#generatorConfig专用属性 #generatorConfig专用属性
project=src/main/java project=src/main/java
resource=src/main/resources resource=src/main/resources

2
src/main/resources/logback-spring.xml
View File

@@ -9,7 +9,7 @@
<contextName>logback</contextName> <contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 --> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
<property name="log.path" value="logs/jshERP" /> <property name="log.path" value="../logs/jshERP" />
<!-- 彩色日志 --> <!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 --> <!-- 彩色日志依赖的渲染类 -->