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

Merge branch 'master' of https://gitee.com/tearn/JSH_ERP

Browse Source 
# Conflicts:
#	src/main/java/com/jsh/erp/service/app/AppService.java
#	src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java
This commit is contained in:
baozhuhui
2019-04-01 21:46:48 +08:00
parent ff28be7173 1a8b4d89f8
commit f2244a3a07
85 changed files with 1632 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erp_web/js/pages/financial/financial_base.js
View File

@@ -486,8 +486,11 @@
{
$.ajax({
type:"post",
url: "/accountHead/" + accountHeadID + "/delete",
url: "/accountHead/batchDeleteAccountHeadByIds",
dataType: "json",
data:{
ids: accountHeadID
},
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -576,7 +579,7 @@
//批量删除
$.ajax({
type:"post",
url: "/accountHead/batchDelete",
url: "/accountHead/batchDeleteAccountHeadByIds",
dataType: "json",
async : false,
data: ({

7
erp_web/js/pages/manage/supplier.js
View File

@@ -170,8 +170,11 @@
var supplierTotalInfo = supplierInfo.split("AaBb");
$.ajax({
type:"post",
url: "/supplier/" + supplierTotalInfo[0] + "/delete",
url: "/supplier/batchDeleteSupplierByIds",
dataType: "json",
data: ({
ids : supplierTotalInfo[0]
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -210,7 +213,7 @@
}
$.ajax({
type:"post",
url: "/supplier/batchDelete",
url: "/supplier/batchDeleteSupplierByIds",
dataType: "json",
async : false,
data: ({

7
erp_web/pages/manage/account.html
View File

@@ -225,8 +225,11 @@
var accountTotalInfo = accountInfo.split("AaBb");
$.ajax({
type: "post",
url: "/account/" + accountTotalInfo[0] + "/delete",
url: "/account/batchDeleteAccountByIds",
dataType: "json",
data: ({
ids: accountTotalInfo[0]
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -264,7 +267,7 @@
}
$.ajax({
type: "post",
url: "/account/batchDelete",
url: "/account/batchDeleteAccountByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/app.html
View File

@@ -270,8 +270,11 @@
if (r) {
$.ajax({
type: "post",
url: "/app/" + appID + "/delete",
url: "/app/batchDeleteAppByIds",
dataType: "json",
data: ({
ids: appID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -309,7 +312,7 @@
}
$.ajax({
type: "post",
url: "/app/batchDelete",
url: "/app/batchDeleteAppByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/depot.html
View File

@@ -255,8 +255,11 @@
if (r) {
$.ajax({
type: "post",
url: "/depot/" + depotID + "/delete",
url: "/depot/batchDeleteDepotByIds",
dataType: "json",
data: ({
ids: depotID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -294,7 +297,7 @@
}
$.ajax({
type: "post",
url: "/depot/batchDelete",
url: "/depot/batchDeleteDepotByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/functions.html
View File

@@ -268,8 +268,11 @@
if (r) {
$.ajax({
type: "post",
url: "/functions/" + functionsID + "/delete",
url: "/functions/batchDeleteFunctionsByIds",
dataType: "json",
data: ({
ids: functionsID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -307,7 +310,7 @@
}
$.ajax({
type: "post",
url: "/functions/batchDelete",
url: "/functions/batchDeleteFunctionsByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/inOutItem.html
View File

@@ -225,8 +225,11 @@
var inOutItemTotalInfo = inOutItemInfo.split("AaBb");
$.ajax({
type: "post",
url: "/inOutItem/" + inOutItemTotalInfo[0] + "/delete",
url: "/inOutItem/batchDeleteInOutItemByIds",
dataType: "json",
data: ({
ids: inOutItemTotalInfo[0]
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -264,7 +267,7 @@
}
$.ajax({
type: "post",
url: "/inOutItem/batchDelete",
url: "/inOutItem/batchDeleteInOutItemByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/role.html
View File

@@ -203,8 +203,11 @@
if (r) {
$.ajax({
type: "post",
url: "/role/" + roleID + "/delete",
url: "/role/batchDeleteRoleByIds",
dataType: "json",
data: ({
ids: roleID,
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -242,7 +245,7 @@
}
$.ajax({
type: "post",
url: "/role/batchDelete",
url: "/role/batchDeleteRoleByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/systemConfig.html
View File

@@ -192,8 +192,11 @@
if (r) {
$.ajax({
type: "post",
url: "/systemConfig/" + systemConfigId + "/delete",
url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json",
data: ({
ids: systemConfigId
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -235,7 +238,7 @@
} else {
$.ajax({
type: "post",
url: "/systemConfig/batchDelete",
url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/manage/unit.html
View File

@@ -197,8 +197,11 @@
if (r) {
$.ajax({
type: "post",
url: "/unit/" + unitID + "/delete",
url: "/unit/batchDeleteUnitByIds",
dataType: "json",
data: ({
ids: unitID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -237,7 +240,7 @@
}
$.ajax({
type: "post",
url: "/unit/batchDelete",
url: "/unit/batchDeleteUnitByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/materials/material.html
View File

@@ -771,8 +771,11 @@
if (r) {
$.ajax({
type: "post",
url: "/material/" + materialID + "/delete",
url: "/material/batchDeleteMaterialByIds",
dataType: "json",
data: ({
ids: materialID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -811,7 +814,7 @@
}
$.ajax({
type: "post",
url: "/material/batchDelete",
url: "/material/batchDeleteMaterialByIds",
dataType: "json",
async: false,
data: ({

7
erp_web/pages/materials/person.html
View File

@@ -249,8 +249,11 @@
if (r) {
$.ajax({
type: "post",
url: "/person/" + personID + "/delete",
url: "/person/batchDeletePersonByIds",
dataType: "json",
data: ({
ids: personID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
@@ -289,7 +292,7 @@
}
$.ajax({
type: "post",
url: "/person/batchDelete",
url: "/person/batchDeletePersonByIds",
dataType: "json",
async: false,
data: ({