From 61e646f821996cb702117a9747f55b9eaadb97bc Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 11 七月 2024 08:50:06 +0800
Subject: [PATCH] 返回结果调整
---
HTML/js/public.js | 6
HTML/views/ASNSetting/BoxInfo.html | 2
HTML/views/BaseSetting/PackagFrom.html | 2
HTML/views/WareHouseSetting/Warehouse.html | 2
HTML/views/SystemSettings/InterfaceDetail.html | 8
HTML/views/ASNSetting/ArrivalLogTask.html | 4
Wms/WMS.BLL/SysServer/InterfaceServer.cs | 4
HTML/views/SOSetting/ExportNoticeAddFrom.html | 4
HTML/views/BaseSetting/CustomerFrom.html | 2
HTML/views/QualityControl/QualityChangeLog.html | 2
HTML/views/BaseSetting/Packag.html | 14 +-
Wms/Utility/Extension/SqlSugarPagedExtensions.cs | 8
HTML/views/Archiving/StockCheck.html | 2
HTML/views/ASNSetting/ArrivalNotice.html | 4
HTML/views/BaseSetting/MaterialsForm.html | 6
HTML/views/SOSetting/ExportNotice.html | 4
HTML/views/SystemSettings/JobForm.html | 4
HTML/views/WareHouseSetting/Area.html | 2
Wms/Wms/Controllers/BasisController.cs | 22 +-
HTML/views/BaseSetting/DepartmentForm.html | 2
HTML/views/BaseSetting/Unit.html | 14 +-
HTML/views/BaseSetting/LogOperation.html | 4
HTML/views/SystemSettings/UserForm.html | 4
HTML/views/BaseSetting/Customer.html | 12
Wms/Wms/Controllers/BllAsnController.cs | 4
HTML/views/Archiving/WaveMage.html | 2
HTML/views/SystemSettings/LogOperation.html | 4
HTML/views/ASNSetting/ProcurePlanNotice.html | 4
Wms/WMS.BLL/LogServer/OperationSysServer.cs | 2
HTML/views/BaseSetting/Materials.html | 10
HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html | 2
HTML/views/SystemSettings/Role.html | 14 +-
HTML/views/SystemSettings/RoleForm.html | 2
HTML/views/WareHouseSetting/Exception.html | 2
Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs | 2
HTML/views/BaseSetting/LogisticsInfoFrom.html | 2
HTML/views/QualityControl/InspectionRequest.html | 2
HTML/views/HouseWithinSetting/TaskSync.html | 2
HTML/views/BaseSetting/Department.html | 10
HTML/views/SOSetting/ExportAllot.html | 2
HTML/views/WareHouseSetting/LogOperation.html | 4
HTML/views/QualityControl/QualityInspectionFrom.html | 6
HTML/views/ASNSetting/PalletBind.html | 2
HTML/views/SystemSettings/FunSettingForm.html | 2
HTML/views/SystemSettings/Interface.html | 10
HTML/views/SOSetting/ExportNoticeEditFrom.html | 4
HTML/views/SystemSettings/Dictionary.html | 2
HTML/views/SystemSettings/Category.html | 2
HTML/views/WareHouseSetting/Pallets.html | 4
HTML/views/QualityControl/QualityInspection.html | 4
HTML/views/Archiving/ExportNotice.html | 2
HTML/views/SystemSettings/Menumanagement.html | 2
HTML/views/ASNSetting/AuditLog.html | 2
HTML/views/SystemSettings/Job.html | 12
HTML/views/HouseWithinSetting/StockCheck.html | 2
HTML/views/BaseSetting/UnitFrom.html | 2
HTML/views/SystemSettings/FunSetting.html | 10
HTML/views/SOSetting/WaveMage.html | 4
HTML/views/ASNSetting/ArrivalReturnsNotice.html | 2
HTML/views/ASNSetting/LabelBox.html | 2
HTML/views/Login.html | 2
HTML/views/WareHouseSetting/Locate.html | 2
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 2
HTML/views/set/user/password.html | 2
HTML/views/WareHouseSetting/Roadway.html | 2
HTML/views/SystemSettings/UserManage.html | 12
HTML/views/SOSetting/WaveMageAddInfo.html | 2
HTML/views/index.html | 4
HTML/views/QualityControl/QualityInformation.html | 2
HTML/views/SystemSettings/RoleRight.html | 2
Wms/Utility/Extension/ApiResponseActionFilter.cs | 29 ++-
Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs | 4
HTML/views/SOSetting/PalletNoOut.html | 2
HTML/views/BaseSetting/LogisticsInfo.html | 12
HTML/views/SOSetting/ExportLogTask.html | 2
75 files changed, 186 insertions(+), 179 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index c184102..7438589 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -13,7 +13,7 @@
{
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun013", {}, 'get', function (res) {
console.log(res.data.SetValue)
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
pageCnt = parseInt(res.data.SetValue);
@@ -268,7 +268,7 @@
function GetIsSetColW()
{
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun014", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
isSetColW=true;
@@ -361,7 +361,7 @@
//鍒嗛〉鏍煎紡鍖�
var FnParseData = function (res) {
return {
- "code": res.code == 200 ? 0 : res.code, // 瑙ｆ瀽鎺ュ彛鐘舵��
+ "code": res.code == 0 ? 0 : res.code, // 瑙ｆ瀽鎺ュ彛鐘舵��
"msg": res.msg, // 瑙ｆ瀽鎻愮ず鏂囨湰
"count": res.data.Total, // 瑙ｆ瀽鏁版嵁闀垮害
"data": res.data.Items // 瑙ｆ瀽鏁版嵁鍒楄〃
diff --git a/HTML/views/ASNSetting/ArrivalLogTask.html b/HTML/views/ASNSetting/ArrivalLogTask.html
index acaaaee..4584c60 100644
--- a/HTML/views/ASNSetting/ArrivalLogTask.html
+++ b/HTML/views/ASNSetting/ArrivalLogTask.html
@@ -604,7 +604,7 @@
$(".shenqingClass").hide(); //鐢宠鍌ㄤ綅
});
sendData(IP + "/Basis/GetFunSettingByNo?funSetNo="+"Fun012", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if(res.data.IsEnable == 'NO')
{
$(function () {
@@ -619,7 +619,7 @@
}
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鍏ュ簱浠诲姟鍙栨秷") {
$(function () {
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 7965c71..514f969 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -512,7 +512,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
@@ -631,7 +631,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍏ュ簱鍗�") {
$(function () {
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 8243770..3c7406f 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -518,7 +518,7 @@
0銆�2銆�4銆�6
*/
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
diff --git a/HTML/views/ASNSetting/ArrivalReturnsNotice.html b/HTML/views/ASNSetting/ArrivalReturnsNotice.html
index 5a18178..700f92d 100644
--- a/HTML/views/ASNSetting/ArrivalReturnsNotice.html
+++ b/HTML/views/ASNSetting/ArrivalReturnsNotice.html
@@ -878,7 +878,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍏ュ簱鍗�") {
$(function() {
diff --git a/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html b/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
index 9a447ae..5d5845c 100644
--- a/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalReturnsNoticeDetail.html
@@ -615,7 +615,7 @@
0銆�2銆�4銆�6
*/
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
diff --git a/HTML/views/ASNSetting/AuditLog.html b/HTML/views/ASNSetting/AuditLog.html
index 353884e..0281ffb 100644
--- a/HTML/views/ASNSetting/AuditLog.html
+++ b/HTML/views/ASNSetting/AuditLog.html
@@ -404,7 +404,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫瀹℃牳璁板綍") {
$(function() {
diff --git a/HTML/views/ASNSetting/BoxInfo.html b/HTML/views/ASNSetting/BoxInfo.html
index a000e8d..b930e6b 100644
--- a/HTML/views/ASNSetting/BoxInfo.html
+++ b/HTML/views/ASNSetting/BoxInfo.html
@@ -619,7 +619,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞绠辨敮褰曞叆") {
$(function () {
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 2b6c445..a153e21 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -525,7 +525,7 @@
$(".delLabelClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "琛ユ墦鏍囩") {
$(function () {
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index e2f1f25..8a091f9 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -849,7 +849,7 @@
$(".chexiaoClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鎵樼洏缁戝畾") {
$(function () {
diff --git a/HTML/views/ASNSetting/ProcurePlanNotice.html b/HTML/views/ASNSetting/ProcurePlanNotice.html
index fcb1f54..103015b 100644
--- a/HTML/views/ASNSetting/ProcurePlanNotice.html
+++ b/HTML/views/ASNSetting/ProcurePlanNotice.html
@@ -331,7 +331,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
@@ -432,7 +432,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鐢熸垚鍏ュ簱鍗�") {
$(function () {
diff --git a/HTML/views/Archiving/ExportNotice.html b/HTML/views/Archiving/ExportNotice.html
index cbad9b0..363100d 100644
--- a/HTML/views/Archiving/ExportNotice.html
+++ b/HTML/views/Archiving/ExportNotice.html
@@ -361,7 +361,7 @@
// refreshTablemx(xqid);
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/Archiving/StockCheck.html b/HTML/views/Archiving/StockCheck.html
index 4425acc..eba152a 100644
--- a/HTML/views/Archiving/StockCheck.html
+++ b/HTML/views/Archiving/StockCheck.html
@@ -564,7 +564,7 @@
$(".editDemoClass").hide();//澶囨敞
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鐩樼偣鍗�") {
$(function() {
diff --git a/HTML/views/Archiving/WaveMage.html b/HTML/views/Archiving/WaveMage.html
index 2ba2158..70f2331 100644
--- a/HTML/views/Archiving/WaveMage.html
+++ b/HTML/views/Archiving/WaveMage.html
@@ -191,7 +191,7 @@
bindTable();
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/BaseSetting/Customer.html b/HTML/views/BaseSetting/Customer.html
index a00130f..7f247a8 100644
--- a/HTML/views/BaseSetting/Customer.html
+++ b/HTML/views/BaseSetting/Customer.html
@@ -132,7 +132,7 @@
height: 'full-95',
id: 'LAY-app-content-list',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
@@ -151,7 +151,7 @@
$(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫瀹㈡埛") {
$(".editClass").show();
@@ -300,7 +300,7 @@
};
sendData(IP + "/Basis/DelsCustomer", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -353,7 +353,7 @@
sendData(IP + "/Basis/AddCustomer", param, 'post',
function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -403,7 +403,7 @@
};
sendData(IP + "/Basis/DelCustomer", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -457,7 +457,7 @@
sendData(IP + "/Basis/EditCustomer", param, 'post',
function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/CustomerFrom.html b/HTML/views/BaseSetting/CustomerFrom.html
index accaac8..3cd5df4 100644
--- a/HTML/views/BaseSetting/CustomerFrom.html
+++ b/HTML/views/BaseSetting/CustomerFrom.html
@@ -117,7 +117,7 @@
Id: parseInt(id),
};
sendData(IP + "/Basis/GetCustomer", param, 'post', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
//椤甸潰璧嬪��
$("input[name='CustomerNo']").val(res.data.CustomerNo);
$("input[name='CustomerNo']").attr('disabled', 'true');
diff --git a/HTML/views/BaseSetting/Department.html b/HTML/views/BaseSetting/Department.html
index 8b257af..4c506bc 100644
--- a/HTML/views/BaseSetting/Department.html
+++ b/HTML/views/BaseSetting/Department.html
@@ -95,7 +95,7 @@
sendData(IP + "/Basis/GetDepartmentList?DepartmentName=" + DepartmentName + "&&DepartmentNo=" + DepartmentNo, {}, "get", function (res) {
console.log(res.data);
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
var list = res.data;
@@ -133,7 +133,7 @@
$(function() {
$(".approvalBtnupt").hide();
});
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++)
{
@@ -253,7 +253,7 @@
Demo: field.Demo,
};
sendData( IP + "/Basis/AddDepartment", param, "post", function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
layer.msg(
res.msg,
@@ -343,7 +343,7 @@
msg: cusid,
};
sendData( IP + "/Basis/DelDepartment?Id="+cusid+"",{},"get",function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
layer.msg(
res.msg,
@@ -410,7 +410,7 @@
Demo: field.Demo,
};
sendData( IP + "/Basis/ExitDepartment", param, "post", function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
layer.msg("淇敼鎴愬姛",
{
diff --git a/HTML/views/BaseSetting/DepartmentForm.html b/HTML/views/BaseSetting/DepartmentForm.html
index 8751c40..467ff6c 100644
--- a/HTML/views/BaseSetting/DepartmentForm.html
+++ b/HTML/views/BaseSetting/DepartmentForm.html
@@ -57,7 +57,7 @@
};
sendData(IP + "/Basis/GetDepartmentById?Id="+param.id+"", {}, 'get', function(res) {
console.log(res);
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
//閮ㄩ棬鍙风紪杈戜笉鏄剧ず
if(res.data.DepartmentNo != "")
diff --git a/HTML/views/BaseSetting/LogOperation.html b/HTML/views/BaseSetting/LogOperation.html
index febc127..4cbd034 100644
--- a/HTML/views/BaseSetting/LogOperation.html
+++ b/HTML/views/BaseSetting/LogOperation.html
@@ -91,7 +91,7 @@
//鑾峰彇绫诲瀷鑿滃崟涓嬫媺
sendData(IP + '/Basis/GetDicTypeList?DicName=鎿嶄綔绫诲瀷', {}, 'get', function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#Type").append('<option value =' + res.data[i].Id + '>' + res.data[i].DictName + '</option>');
@@ -165,7 +165,7 @@
MenuNo: $("#MenuNo").val(),
ParentNo: '鍩虹淇℃伅',
},
- parseData: FnParseData,
+
contentType: 'application/json',
defaultToolbar: [],
headers: { ToKen: $.cookie('token') },
diff --git a/HTML/views/BaseSetting/LogisticsInfo.html b/HTML/views/BaseSetting/LogisticsInfo.html
index 7d5959d..a52b7bf 100644
--- a/HTML/views/BaseSetting/LogisticsInfo.html
+++ b/HTML/views/BaseSetting/LogisticsInfo.html
@@ -137,7 +137,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
// toolbar:'#toolbarDemo',
@@ -262,7 +262,7 @@
$(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鐗╂祦") {
$(".editClass").show();
@@ -324,7 +324,7 @@
sendData(IP + "/Basis/DelsLogisticsInfo", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -376,7 +376,7 @@
};
sendData(IP + "/Basis/AddLogisticsInfo", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -428,7 +428,7 @@
};
sendData(IP + "/Basis/DelLogisticsInfo", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -483,7 +483,7 @@
sendData(IP + "/Basis/EditLogisticsInfo", param, 'post',
function (res) {
console.log(res);
- if(res.code == 200) { //鎴愬姛
+ if(res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/LogisticsInfoFrom.html b/HTML/views/BaseSetting/LogisticsInfoFrom.html
index 6221b36..6bba914 100644
--- a/HTML/views/BaseSetting/LogisticsInfoFrom.html
+++ b/HTML/views/BaseSetting/LogisticsInfoFrom.html
@@ -113,7 +113,7 @@
Id: parseInt(id),
};
sendData(IP + "/Basis/GetLogisticsInfo", param, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
//椤甸潰璧嬪��
$("input[name='CarrierName']").val(res.data.CarrierName);
$("input[name='Address']").val(res.data.Address);
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 441f040..a28aba1 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -245,7 +245,7 @@
var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment+"&CategoryNo="+CategoryNo;
sendData(IP + url, {}, 'get', function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data;
$.extend(infoOptions, {
@@ -275,7 +275,7 @@
$(function() {
$(".approvalBtnupt").hide();
});
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鐗╂枡")
@@ -459,7 +459,7 @@
doing = false;
sendData(IP + "/Basis/AddMate", param, 'post',function(res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -559,7 +559,7 @@
doing = false;
sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -641,7 +641,7 @@
doing = false;
sendData(IP + "/Basis/ExitMate", param, 'post',
function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
layer.msg("淇敼鎴愬姛", {
icon: 1,
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index e73933f..a2ee30a 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -279,7 +279,7 @@
var sel1 = false;
//鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
@@ -299,7 +299,7 @@
var sel2 = false;
//鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
@@ -328,7 +328,7 @@
UserId: id,
};
synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
// console.log(res.data.CategoryNo)
//瀹℃壒鐘舵�佺紪杈戞樉绀�
diff --git a/HTML/views/BaseSetting/Packag.html b/HTML/views/BaseSetting/Packag.html
index 84549ce..3b39ef5 100644
--- a/HTML/views/BaseSetting/Packag.html
+++ b/HTML/views/BaseSetting/Packag.html
@@ -138,7 +138,7 @@
url: url,
method: 'post',
where: where,
- parseData: FnParseData,
+
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
page: true,
@@ -150,7 +150,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍖呰") {
$(function() {
@@ -283,7 +283,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍖呰")
{
@@ -335,7 +335,7 @@
doing = false;
sendData(IP + "/Basis/GetPackagList", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -414,7 +414,7 @@
sendData(IP + "/Basis/AddPackag", param, 'post',
function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -471,7 +471,7 @@
if (doing) {
doing = false;
sendData(IP + "/Basis/DelPackag", param, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -543,7 +543,7 @@
sendData(IP + "/Basis/EditPackag", param, 'post',
function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/PackagFrom.html b/HTML/views/BaseSetting/PackagFrom.html
index 9bf174c..00f81dc 100644
--- a/HTML/views/BaseSetting/PackagFrom.html
+++ b/HTML/views/BaseSetting/PackagFrom.html
@@ -152,7 +152,7 @@
sendData(IP + "/Basis/GetPackagById?Id="+id, param, 'get', function(res) {
console.log(res);
//console.log(res.data.IsValid == 0);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
//鍖呰缂栫爜
if (res.data.SkuNo != "") {
$("input[name='PackCode']").attr("disabled", "disabled")
diff --git a/HTML/views/BaseSetting/Unit.html b/HTML/views/BaseSetting/Unit.html
index 1328e03..ca66c91 100644
--- a/HTML/views/BaseSetting/Unit.html
+++ b/HTML/views/BaseSetting/Unit.html
@@ -109,7 +109,7 @@
url: url,
method: 'post',
where: where,
- parseData: FnParseData,
+
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
page: true,
@@ -126,7 +126,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍗曚綅") {
@@ -246,7 +246,7 @@
doing = false;
synData(IP + "/Basis/DelsUnit", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -304,7 +304,7 @@
sendData(IP + "/Basis/AddUnit", param, 'post',
function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -359,7 +359,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鍗曚綅") {
$(function () {
@@ -405,7 +405,7 @@
doing = false;
sendData(IP + "/Basis/DelUnit", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -463,7 +463,7 @@
sendData(IP + "/Basis/EditUnit", param, 'post',
function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/BaseSetting/UnitFrom.html b/HTML/views/BaseSetting/UnitFrom.html
index e09867c..4f9706f 100644
--- a/HTML/views/BaseSetting/UnitFrom.html
+++ b/HTML/views/BaseSetting/UnitFrom.html
@@ -52,7 +52,7 @@
};
sendData(IP + "/Basis/GetUnit", param, 'post', function(res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
//椤甸潰璧嬪��
$("input[name='UnitNo']").val(res.data.UnitNo);
$("input[name='UnitName']").val(res.data.UnitName);
diff --git a/HTML/views/HouseWithinSetting/StockCheck.html b/HTML/views/HouseWithinSetting/StockCheck.html
index 0cc78e5..b1219ad 100644
--- a/HTML/views/HouseWithinSetting/StockCheck.html
+++ b/HTML/views/HouseWithinSetting/StockCheck.html
@@ -603,7 +603,7 @@
$(".editDemoClass").hide();//澶囨敞
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鐩樼偣鍗�") {
$(function() {
diff --git a/HTML/views/HouseWithinSetting/TaskSync.html b/HTML/views/HouseWithinSetting/TaskSync.html
index a099384..6d7cec5 100644
--- a/HTML/views/HouseWithinSetting/TaskSync.html
+++ b/HTML/views/HouseWithinSetting/TaskSync.html
@@ -411,7 +411,7 @@
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "澶勭悊鍚屾浠诲姟") {
$(function() {
diff --git a/HTML/views/Login.html b/HTML/views/Login.html
index 69452cf..b3dddba 100644
--- a/HTML/views/Login.html
+++ b/HTML/views/Login.html
@@ -112,7 +112,7 @@
};
sendData(IP + "/WeatherForecast/Login", param, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$.cookie('token', res.data);
layer.msg("鐧诲綍鎴愬姛", {
icon: 1,
diff --git a/HTML/views/QualityControl/InspectionRequest.html b/HTML/views/QualityControl/InspectionRequest.html
index 6922277..315ac19 100644
--- a/HTML/views/QualityControl/InspectionRequest.html
+++ b/HTML/views/QualityControl/InspectionRequest.html
@@ -458,7 +458,7 @@
$(".clossClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "璇烽獙") {
$(function () {
diff --git a/HTML/views/QualityControl/QualityChangeLog.html b/HTML/views/QualityControl/QualityChangeLog.html
index 3982921..c48fff2 100644
--- a/HTML/views/QualityControl/QualityChangeLog.html
+++ b/HTML/views/QualityControl/QualityChangeLog.html
@@ -259,7 +259,7 @@
$("#approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
{
diff --git a/HTML/views/QualityControl/QualityInformation.html b/HTML/views/QualityControl/QualityInformation.html
index 0b7afab..6536610 100644
--- a/HTML/views/QualityControl/QualityInformation.html
+++ b/HTML/views/QualityControl/QualityInformation.html
@@ -294,7 +294,7 @@
$("#approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
{
diff --git a/HTML/views/QualityControl/QualityInspection.html b/HTML/views/QualityControl/QualityInspection.html
index 72fa725..efb7087 100644
--- a/HTML/views/QualityControl/QualityInspection.html
+++ b/HTML/views/QualityControl/QualityInspection.html
@@ -215,7 +215,7 @@
$(function() {
$("#approvalBtn").hide();
});
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璐ㄦ缁撴灉")
@@ -377,7 +377,7 @@
doing = false;
sendData(IP + "/Basis/AddMate", param, 'post',function(res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/QualityControl/QualityInspectionFrom.html b/HTML/views/QualityControl/QualityInspectionFrom.html
index 34f566f..cf0db7a 100644
--- a/HTML/views/QualityControl/QualityInspectionFrom.html
+++ b/HTML/views/QualityControl/QualityInspectionFrom.html
@@ -67,7 +67,7 @@
//鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
sendData(IP + "/Basis/GetUnitList",{},'get',function(res){
- if(res.code == 200) //鎴愬姛
+ if(res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++)
{
@@ -86,7 +86,7 @@
//鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
sendData(IP + "/Basis/GetPackagList",{},'get',function(res){
- if(res.code == 200) //鎴愬姛
+ if(res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++)
{
@@ -115,7 +115,7 @@
UserId: id,
};
sendData(IP + "/Basis/GetMateById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
//瀹℃壒鐘舵�佺紪杈戞樉绀�
if(res.data.AuditStatusNo != "")
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 121fede..24dfb71 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -789,7 +789,7 @@
$(".chexiaoClass").hide(); //鎾ら攢
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].ParentNo == "2400") {
if (res.data[k].MenuName == "鎾ら攢") {
diff --git a/HTML/views/SOSetting/ExportLogTask.html b/HTML/views/SOSetting/ExportLogTask.html
index 6d25769..eb5a6b1 100644
--- a/HTML/views/SOSetting/ExportLogTask.html
+++ b/HTML/views/SOSetting/ExportLogTask.html
@@ -518,7 +518,7 @@
$(".outClass").hide(); //瀹屾垚
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if(res.data[k].ParentNo == "2600")
{
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b95460c..b01f45e 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -472,7 +472,7 @@
// refreshTablemx(xqid);
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
@@ -1034,7 +1034,7 @@
$(".checkClass").hide(); //澶嶆牳
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].ParentNo == "2100") {
if (res.data[k].MenuName == "娣诲姞鍑哄簱鍗�") {
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 4f4fa21..0a0b1f1 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -496,7 +496,7 @@
//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
function getCustomerList() {
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#CustomerNo").empty();
$("#CustomerNo").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
@@ -561,7 +561,7 @@
//鑾峰彇鐗╂祦鎵胯繍鍟嗕笅鎷夋淇℃伅
function getLogisticsInfoList() {
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index b5412ce..b6dc461 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -501,7 +501,7 @@
//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
function getCustomerList(customerNo) {
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
var TypeNum = 0;
switch($("#Type").val())
@@ -567,7 +567,7 @@
//鑾峰彇鐗╂祦鎵胯繍鍟嗕笅鎷夋淇℃伅
function getLogisticsInfoList(logisticsId) {
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SOSetting/PalletNoOut.html b/HTML/views/SOSetting/PalletNoOut.html
index 9d7cc6a..c24ce63 100644
--- a/HTML/views/SOSetting/PalletNoOut.html
+++ b/HTML/views/SOSetting/PalletNoOut.html
@@ -376,7 +376,7 @@
$(".outClass").hide(); //鍑哄簱
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if(res.data[k].ParentNo == "2800")
{
diff --git a/HTML/views/SOSetting/WaveMage.html b/HTML/views/SOSetting/WaveMage.html
index bd47d5b..8ca00c6 100644
--- a/HTML/views/SOSetting/WaveMage.html
+++ b/HTML/views/SOSetting/WaveMage.html
@@ -263,7 +263,7 @@
bindTable();
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
@@ -579,7 +579,7 @@
$(".delWaveClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞娉㈡") {
$(function () {
diff --git a/HTML/views/SOSetting/WaveMageAddInfo.html b/HTML/views/SOSetting/WaveMageAddInfo.html
index 90c7c00..0a107c2 100644
--- a/HTML/views/SOSetting/WaveMageAddInfo.html
+++ b/HTML/views/SOSetting/WaveMageAddInfo.html
@@ -62,7 +62,7 @@
//鑾峰彇鎵胯繍鍟嗙墿娴�
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
$("#LogisticsId").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index f692ada..5aefbcb 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -136,7 +136,7 @@
$(function() {
$(".approvalBtndel").hide();
});
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "鏂板绫诲埆") {
$(function() {
diff --git a/HTML/views/SystemSettings/Dictionary.html b/HTML/views/SystemSettings/Dictionary.html
index 70997fb..af6d469 100644
--- a/HTML/views/SystemSettings/Dictionary.html
+++ b/HTML/views/SystemSettings/Dictionary.html
@@ -217,7 +217,7 @@
$(function() {
$(".approvalBtndel").hide();
});
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞瀛楀吀") {
$(function() {
diff --git a/HTML/views/SystemSettings/FunSetting.html b/HTML/views/SystemSettings/FunSetting.html
index e631df5..c264676 100644
--- a/HTML/views/SystemSettings/FunSetting.html
+++ b/HTML/views/SystemSettings/FunSetting.html
@@ -104,7 +104,7 @@
GroupNo: GroupNo
};
sendData(IP + "/Basis/GetFunSettingList?FunSetName="+FunSetName+"&&IsEnable="+IsEnable+"&&GroupNo="+GroupNo, {}, 'get', function(res) {
- if (res.code == 200)
+ if (res.code == 0)
{ //鎴愬姛
var list = res.data;
$.extend(infoOptions, {
@@ -125,7 +125,7 @@
$(".approvalBtndel").hide();
});
console.log(res)
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞璁惧畾") {
$(function() {
@@ -256,7 +256,7 @@
doing = false;
sendData(IP + "/basis/AddFunSettings", param, 'post',function(res) {
console.log(res);
- if (res.code == 200)
+ if (res.code == 0)
{ //鎴愬姛
layer.msg(res.msg, {
icon: 1,
@@ -340,7 +340,7 @@
doing = false;
sendData(IP + "/Basis/DelFunSettings?Id="+data.Id+"", {} , 'get', function(res) {
console.log(res);
- if (res.code == 200)
+ if (res.code == 0)
{ //鎴愬姛
layer.msg(res.msg, {
icon: 1,
@@ -400,7 +400,7 @@
doing = false;
sendData(IP + "/basis/ExitFunSettings", param, 'post',
function(res) {
- if (res.code == 200)
+ if (res.code == 0)
{ //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
diff --git a/HTML/views/SystemSettings/FunSettingForm.html b/HTML/views/SystemSettings/FunSettingForm.html
index f8eebea..6b21256 100644
--- a/HTML/views/SystemSettings/FunSettingForm.html
+++ b/HTML/views/SystemSettings/FunSettingForm.html
@@ -87,7 +87,7 @@
UserId: id,
};
sendData(IP + "/basis/GetFunSettingById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
- if (res.code == 200)
+ if (res.code == 0)
{ //鎴愬姛
//椤甸潰璧嬪��
if(res.data.FunSetNo != "")
diff --git a/HTML/views/SystemSettings/Interface.html b/HTML/views/SystemSettings/Interface.html
index d9365a3..555c514 100644
--- a/HTML/views/SystemSettings/Interface.html
+++ b/HTML/views/SystemSettings/Interface.html
@@ -165,7 +165,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
headers:{ToKen:$.cookie('token')},
page: true,
@@ -296,7 +296,7 @@
height: h2,
id: 'LAY-app-content-list2',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
toolbar:'',
defaultToolbar: '', //'print', 'exports'
@@ -462,7 +462,7 @@
InterfaceNo:data.InterfaceNo,
};
sendData(IP + "/Basis/DelInterface", param, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -496,7 +496,7 @@
InterfaceNo:data.InterfaceNo
};
sendData(IP + "/Basis/DelInterfaceDetail", param, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -527,7 +527,7 @@
$(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鎺ュ彛") {
$(function() {
diff --git a/HTML/views/SystemSettings/InterfaceDetail.html b/HTML/views/SystemSettings/InterfaceDetail.html
index 7ad6f30..90a6e5c 100644
--- a/HTML/views/SystemSettings/InterfaceDetail.html
+++ b/HTML/views/SystemSettings/InterfaceDetail.html
@@ -331,7 +331,7 @@
InterfaceNo: id
};
sendData(IP + "/Basis/GetInterfaceList", param, 'post', function (res) {
- if (res.code == 200) {
+ if (res.code == 0) {
var data = res.data.Items[0];
$("input[name='InterfaceNo']").val(data.InterfaceNo);
$("input[name='InterfaceName']").val(data.InterfaceName);
@@ -347,7 +347,7 @@
InterfaceNo: id
};
sendData(IP + "/Basis/GetInterfaceDetailList", paramDetail, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
var data = res.data.Items;
//椤甸潰璧嬪��
$.extend(infoOptions, {
@@ -533,7 +533,7 @@
if (id == null) {
// 娣诲姞
sendData(IP + "/Basis/AddInterface", item2, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -553,7 +553,7 @@
else {
// 缂栬緫
sendData(IP + "/Basis/EditInterface", item2, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/SystemSettings/Job.html b/HTML/views/SystemSettings/Job.html
index 6f8230b..4589fe9 100644
--- a/HTML/views/SystemSettings/Job.html
+++ b/HTML/views/SystemSettings/Job.html
@@ -86,7 +86,7 @@
sendData(IP + url, {}, 'get', function (res) {
// console.log(res.data)
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data;
$.extend(infoOptions, {
@@ -189,7 +189,7 @@
case "execute":
sendData(IP + "/Job/TriggerJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -226,7 +226,7 @@
layer.confirm('纭畾鍒犻櫎閫変腑鐨勬ā鏉匡紵', function (index) {
sendData(IP + "/Job/RemoveJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -252,7 +252,7 @@
case "detail":
sendData(IP + "/Job/GetJobLogs", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
if (res.data) {
layer.open({
type: 1,
@@ -282,7 +282,7 @@
case "Play":
sendData(IP + "/Job/ResumeJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -305,7 +305,7 @@
case "Pause":
sendData(IP + "/Job/StopJob", { Name: data.Name, Group: data.GroupName }, 'post', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/SystemSettings/JobForm.html b/HTML/views/SystemSettings/JobForm.html
index 9d99887..196337c 100644
--- a/HTML/views/SystemSettings/JobForm.html
+++ b/HTML/views/SystemSettings/JobForm.html
@@ -173,7 +173,7 @@
if (objRowsData) {
sendData(IP + "/Job/QueryJob", { Group: objRowsData.GroupName, Name: objRowsData.Name }, 'post', function (res) {
- if (res.code == 200) {
+ if (res.code == 0) {
setFormData(res.data, "#layuiadmin-app-form-list");
if (res.data.BeginTime) {
$("#BeginTime").val(dateTimeOffsetToDateTimeString(res.data.BeginTime));
@@ -228,7 +228,7 @@
param = obj.field;
}
sendData(IP + url, param, 'post', function (res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/SystemSettings/LogOperation.html b/HTML/views/SystemSettings/LogOperation.html
index 3bd3ee6..e686375 100644
--- a/HTML/views/SystemSettings/LogOperation.html
+++ b/HTML/views/SystemSettings/LogOperation.html
@@ -91,7 +91,7 @@
//鑾峰彇绫诲瀷鑿滃崟涓嬫媺
sendData(IP + '/Basis/GetDicTypeList?DicName=鎿嶄綔绫诲瀷', {}, 'get', function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#Type").append('<option value =' + res.data[i].Id + '>' + res.data[i].DictName + '</option>');
@@ -165,7 +165,7 @@
MenuNo: $("#MenuNo").val(),
ParentNo: '绯荤粺璁剧疆',
},
- parseData: FnParseData,
+
contentType: 'application/json',
defaultToolbar: [],
headers: { ToKen: $.cookie('token') },
diff --git a/HTML/views/SystemSettings/Menumanagement.html b/HTML/views/SystemSettings/Menumanagement.html
index d1f38e3..d44ce46 100644
--- a/HTML/views/SystemSettings/Menumanagement.html
+++ b/HTML/views/SystemSettings/Menumanagement.html
@@ -203,7 +203,7 @@
$(".approvalBtnupt").hide();
$(".approvalBtndel").hide();
});
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
var list = res.data.filter(item => item.Layer == 0);
if (list) {
for (var i = 0; i < list.length; i++) {
diff --git a/HTML/views/SystemSettings/Role.html b/HTML/views/SystemSettings/Role.html
index 021b914..7c65efe 100644
--- a/HTML/views/SystemSettings/Role.html
+++ b/HTML/views/SystemSettings/Role.html
@@ -97,7 +97,7 @@
RoleName: RoleName,
};
sendData(IP + "/Basis/GetRolesList?RoleNo=" + RoleNo + "&RoleName=" + RoleName, {}, "get", function (res) {
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
var list = res.data;
@@ -136,7 +136,7 @@
$(function() {
$(".approvalBtndel").hide();
});
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
for (var k = 0; k < res.data.length; k++)
@@ -232,7 +232,7 @@
sendData(IP + "/basis/GetRolesList", {}, "get", function (res) {
var html = "";
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
var list = res.data;
@@ -298,7 +298,7 @@
Demo: field.Demo, //澶囨敞
};
sendData( IP + "/basis/UpdateRolesInfo", param, "post", function (res) {
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
layer.msg(
@@ -365,7 +365,7 @@
Demo: field.Demo, //澶囨敞
};
sendData( IP + "/basis/UpdateRolesInfo", param, "post", function (res) {
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
layer.msg(
@@ -416,7 +416,7 @@
doing = false;
sendData( IP + "/Basis/DeleteRoleInfo?Roleids=" + data.Id + "", {}, "get", function (res) {
console.log(res);
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
layer.msg(
@@ -487,7 +487,7 @@
{
doing = false;
sendData( IP + "/basis/InsertRoleInfo", param, "post", function (res) {
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
layer.msg(
diff --git a/HTML/views/SystemSettings/RoleForm.html b/HTML/views/SystemSettings/RoleForm.html
index 7e4c102..7bcc62a 100644
--- a/HTML/views/SystemSettings/RoleForm.html
+++ b/HTML/views/SystemSettings/RoleForm.html
@@ -65,7 +65,7 @@
};
console.log(id)
sendData(IP + "/basis/GetRolesListById?Roleid="+id, {} , 'get', function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
console.log(res.data)
//椤甸潰璧嬪��
diff --git a/HTML/views/SystemSettings/RoleRight.html b/HTML/views/SystemSettings/RoleRight.html
index 133e3af..a8bc440 100644
--- a/HTML/views/SystemSettings/RoleRight.html
+++ b/HTML/views/SystemSettings/RoleRight.html
@@ -462,7 +462,7 @@
}
}
synData(IP +"/basis/InsertRoleRight?MenuNo="+rightListStr+"&&Id="+ids+"",{},"post",function (res) {
- if (res.code == 200)
+ if (res.code == 0)
{
//鎴愬姛
layer.msg(res.msg,{
diff --git a/HTML/views/SystemSettings/UserForm.html b/HTML/views/SystemSettings/UserForm.html
index daffb9f..9ae950b 100644
--- a/HTML/views/SystemSettings/UserForm.html
+++ b/HTML/views/SystemSettings/UserForm.html
@@ -135,7 +135,7 @@
var istrue = "0";
//瑙掕壊
sendData(IP + "/basis/GetRolesList", {}, 'get', function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
console.log(res.data)
//瑙掕壊鎷兼帴HTML
@@ -159,7 +159,7 @@
UserId: id,
};
sendData(IP + "/basis/GetUserinfoListById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
//椤甸潰璧嬪��
if(res.data.UserNo != "")
diff --git a/HTML/views/SystemSettings/UserManage.html b/HTML/views/SystemSettings/UserManage.html
index 352bef6..7264537 100644
--- a/HTML/views/SystemSettings/UserManage.html
+++ b/HTML/views/SystemSettings/UserManage.html
@@ -116,7 +116,7 @@
//鑾峰彇瑙掕壊淇℃伅
sendData(IP + "/basis/GetRolesList", {}, 'get', function(res) {
var html = '';
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data;
for (var i = 0; i < list.length; i++) {
@@ -145,7 +145,7 @@
console.log(res.data)
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data;
$.extend(infoOptions, {
@@ -203,7 +203,7 @@
$(function() {
$(".approvalBtnupt").hide();
});
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
var list = res.data.filter(item => item.Layer == 0);
if (list)
@@ -395,7 +395,7 @@
doing = false;
sendData(IP + "/basis/InsertUserinfo", param, 'post',function(res) {
console.log(res);
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
layer.msg(res.msg, {
icon: 1,
@@ -459,7 +459,7 @@
doing = false;
sendData(IP + "/Basis/DeleteUserInfo?Userids="+data.Id+"", {} , 'get', function(res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -550,7 +550,7 @@
doing = false;
sendData(IP + "/basis/UpdateUserinfo", param, 'post',
function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg("淇敼鎴愬姛", {
icon: 1,
time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 2c0cb33..385bc4e 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -162,7 +162,7 @@
$("#approvalBtn").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍖哄煙") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Exception.html b/HTML/views/WareHouseSetting/Exception.html
index 77f6250..3cad3ae 100644
--- a/HTML/views/WareHouseSetting/Exception.html
+++ b/HTML/views/WareHouseSetting/Exception.html
@@ -157,7 +157,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "澶勭悊寮傚父") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 8b52d11..9f52be6 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -292,7 +292,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫鍌ㄤ綅") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/LogOperation.html b/HTML/views/WareHouseSetting/LogOperation.html
index dd6a819..3ee0f8c 100644
--- a/HTML/views/WareHouseSetting/LogOperation.html
+++ b/HTML/views/WareHouseSetting/LogOperation.html
@@ -91,7 +91,7 @@
//鑾峰彇绫诲瀷鑿滃崟涓嬫媺
sendData(IP + '/Basis/GetDicTypeList?DicName=鎿嶄綔绫诲瀷', {}, 'get', function (res) {
- if (res.code == 200) //鎴愬姛
+ if (res.code == 0) //鎴愬姛
{
for (var i = 0; i < res.data.length; i++) {
$("#Type").append('<option value =' + res.data[i].Id + '>' + res.data[i].DictName + '</option>');
@@ -165,7 +165,7 @@
MenuNo: $("#MenuNo").val(),
ParentNo: '浠撳簱璁剧疆',
},
- parseData: FnParseData,
+
contentType: 'application/json',
defaultToolbar: [],
headers: { ToKen: $.cookie('token') },
diff --git a/HTML/views/WareHouseSetting/Pallets.html b/HTML/views/WareHouseSetting/Pallets.html
index 7e58133..a7a3e9b 100644
--- a/HTML/views/WareHouseSetting/Pallets.html
+++ b/HTML/views/WareHouseSetting/Pallets.html
@@ -111,7 +111,7 @@
$(".add").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
$(function() {
@@ -205,7 +205,7 @@
$(".addClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "娣诲姞鏉＄爜") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index 89fbef8..163c1ee 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -161,7 +161,7 @@
$(".onOffClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫宸烽亾") {
$(function() {
diff --git a/HTML/views/WareHouseSetting/Warehouse.html b/HTML/views/WareHouseSetting/Warehouse.html
index df6d072..dcf8c9e 100644
--- a/HTML/views/WareHouseSetting/Warehouse.html
+++ b/HTML/views/WareHouseSetting/Warehouse.html
@@ -106,7 +106,7 @@
$(".editClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
if (res.data[k].MenuName == "缂栬緫浠撳簱") {
$(function() {
diff --git a/HTML/views/index.html b/HTML/views/index.html
index c135460..bb31ca3 100644
--- a/HTML/views/index.html
+++ b/HTML/views/index.html
@@ -167,7 +167,7 @@
}
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
var list = res.data.filter(item => item.level == "0");
localStorage.setItem('listRole',JSON.stringify(res.data));
if (list) {
@@ -212,7 +212,7 @@
});
sendData(IP + "/Basis/IsPassWordTime", "", 'get', function(res) {
- if (res.code == 200 && res.data == 1) { //鎴愬姛
+ if (res.code == 0 && res.data == 1) { //鎴愬姛
layer.open({
type: 2,
title: '瀵嗙爜宸茶繃鏈燂紝璇蜂慨鏀瑰瘑鐮�',
diff --git a/HTML/views/set/user/password.html b/HTML/views/set/user/password.html
index 46e1de5..2bd8871 100644
--- a/HTML/views/set/user/password.html
+++ b/HTML/views/set/user/password.html
@@ -77,7 +77,7 @@
doing = false;
sendData(IP + "/Basis/UptUserPassWord", param, 'get', function (res) {
console.log(res);
- if (res.code == 200) { //鎴愬姛
+ if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
diff --git a/Wms/Utility/Extension/ApiResponseActionFilter.cs b/Wms/Utility/Extension/ApiResponseActionFilter.cs
index 6f73a0c..5802b58 100644
--- a/Wms/Utility/Extension/ApiResponseActionFilter.cs
+++ b/Wms/Utility/Extension/ApiResponseActionFilter.cs
@@ -8,6 +8,7 @@
using System.Text;
using System.Threading.Tasks;
using Utility.Entity;
+using Utility.Extension;
namespace Utility
{
@@ -21,16 +22,22 @@
// 鍦ㄦ墽琛屽姩浣滀箣鍚庣殑閫昏緫
if (resultContext.Result is ObjectResult objectResult)
{
- var apiResponse = new ApiResponse<object>(
- context.HttpContext.Response.StatusCode,
- context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
- objectResult.Value);
-
- //if (resultContext.Result is SqlSugarPagedList)
- //{
- // apiResponse.count = ((SqlSugarPagedList)resultContext.Result).Total;
- //}
-
+ ApiResponse<object> apiResponse;
+ if (objectResult.Value is SqlSugarPagedList)
+ {
+ apiResponse = new ApiResponse<object>(
+ context.HttpContext.Response.StatusCode == 200 ? 0 : 1,
+ context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
+ ((SqlSugarPagedList)objectResult.Value).Items,
+ ((SqlSugarPagedList)objectResult.Value).Total);
+ }
+ else
+ {
+ apiResponse = new ApiResponse<object>(
+ context.HttpContext.Response.StatusCode == 200 ? 0 : 1,
+ context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
+ objectResult.Value);
+ }
var json = JsonConvert.SerializeObject(apiResponse);
context.HttpContext.Response.ContentType = "application/json";
context.HttpContext.Response.ContentLength = Encoding.UTF8.GetByteCount(json);
@@ -40,7 +47,7 @@
if (resultContext.Result is EmptyResult)
{
var apiResponse = new ApiResponse<object>(
- context.HttpContext.Response.StatusCode,
+ context.HttpContext.Response.StatusCode == 200 ? 0 : 1,
context.HttpContext.Response.StatusCode == 200 ? "璇锋眰鎴愬姛" : "閿欒",
"璇锋眰鎴愬姛"
);
diff --git a/Wms/Utility/Extension/SqlSugarPagedExtensions.cs b/Wms/Utility/Extension/SqlSugarPagedExtensions.cs
index 697f375..1528e27 100644
--- a/Wms/Utility/Extension/SqlSugarPagedExtensions.cs
+++ b/Wms/Utility/Extension/SqlSugarPagedExtensions.cs
@@ -6,7 +6,7 @@
namespace Utility
{
- public class SqlSugarPagedList<TEntity> where TEntity : new()
+ public class SqlSugarPagedList
{
/// <summary>
/// 鎬绘潯鏁�
@@ -21,7 +21,7 @@
/// <summary>
/// 褰撳墠椤甸泦鍚�
/// </summary>
- public IEnumerable<TEntity> Items { get; set; }
+ public object Items { get; set; }
}
/// <summary>
/// 鍒嗛〉鎷撳睍绫�
@@ -35,13 +35,13 @@
/// <param name="pageIndex">褰撳墠椤电爜锛屼粠1寮�濮�</param>
/// <param name="pageSize">椤电爜瀹归噺</param>
/// <returns></returns>
- public static async Task<SqlSugarPagedList<TEntity>> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize)
+ public static async Task<SqlSugarPagedList> ToPagedListAsync<TEntity>(this ISugarQueryable<TEntity> query, int pageIndex, int pageSize)
where TEntity : new()
{
RefAsync<int> total = 0;
var items = await query.ToPageListAsync(pageIndex, pageSize, total);
var totalPages = pageSize > 0 ? (int)Math.Ceiling(total / (double)pageSize) : 0;
- return new SqlSugarPagedList<TEntity>
+ return new SqlSugarPagedList
{
Items = items,
Total = total,
diff --git a/Wms/WMS.BLL/LogServer/OperationSysServer.cs b/Wms/WMS.BLL/LogServer/OperationSysServer.cs
index b22d150..96b053a 100644
--- a/Wms/WMS.BLL/LogServer/OperationSysServer.cs
+++ b/Wms/WMS.BLL/LogServer/OperationSysServer.cs
@@ -86,7 +86,7 @@
/// <param name="menuNo">鑿滃崟鍙�</param>
/// <param name="parentNo">妯″潡鍙�</param>
/// <returns></returns>
- public async Task<SqlSugarPagedList<OperationDto>> GetSysOperationList(GetOperationVm model)
+ public async Task<SqlSugarPagedList> GetSysOperationList(GetOperationVm model)
{
return await Db.Queryable<LogOperationSys>()
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
diff --git a/Wms/WMS.BLL/SysServer/InterfaceServer.cs b/Wms/WMS.BLL/SysServer/InterfaceServer.cs
index 20bc4aa..b81ef8e 100644
--- a/Wms/WMS.BLL/SysServer/InterfaceServer.cs
+++ b/Wms/WMS.BLL/SysServer/InterfaceServer.cs
@@ -39,7 +39,7 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- public async Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model)
+ public async Task<SqlSugarPagedList> GetInterfaceList(InterfaceVm model)
{
return await Db.Queryable<SysInterface>()
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
@@ -63,7 +63,7 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- public async Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model)
+ public async Task<SqlSugarPagedList> GetInterfaceDetailList(InterfaceDetailVm model)
{
return await Db.Queryable<SysInterfaceDetail>()
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
diff --git a/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs b/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs
index 2386291..93aeebd 100644
--- a/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs
+++ b/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs
@@ -49,7 +49,7 @@
/// <param name="menuno">鑿滃崟鍙�</param>
/// <param name="parentno">妯″潡鍙�</param>
/// <returns></returns>
- Task<SqlSugarPagedList<OperationDto>> GetSysOperationList(GetOperationVm model);
+ Task<SqlSugarPagedList> GetSysOperationList(GetOperationVm model);
/// <summary>
/// 鏂板绯荤粺鎿嶄綔鏃ュ織
diff --git a/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs b/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs
index f9ab087..cb50cac 100644
--- a/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs
@@ -17,7 +17,7 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model);
+ Task<SqlSugarPagedList> GetInterfaceList(InterfaceVm model);
/// <summary>
/// 鑾峰彇鎺ュ彛鏄庣粏鍒楄〃
@@ -25,7 +25,7 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model);
+ Task<SqlSugarPagedList> GetInterfaceDetailList(InterfaceDetailVm model);
/// <summary>
/// 娣诲姞鎺ュ彛淇℃伅
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index e208bcb..6b5bcd3 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -892,11 +892,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<CustomerDto>> GetCustomerList(GetCustomerVm model)
+ public async Task<SqlSugarPagedList> GetCustomerList(GetCustomerVm model)
{
RefAsync<int> count = new RefAsync<int>();
var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
- return new SqlSugarPagedList<CustomerDto>() { Items = bolls, Total = count };
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯瀹㈡埛淇℃伅
@@ -974,11 +974,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<LogisticsInfoDto>> GetLogisticsInfoList(GetLogisticsInfoVm model)
+ public async Task<SqlSugarPagedList> GetLogisticsInfoList(GetLogisticsInfoVm model)
{
RefAsync<int> count = new RefAsync<int>();
var list = await _logisticsSvc.GetLogisticsInfoList(model.CarrierName, model.LinkMan, model.Phone, model.LicensePlate, model.Type, model.Page, model.Limit, count);
- return new SqlSugarPagedList<LogisticsInfoDto>() { Items = list, Total = count };
+ return new SqlSugarPagedList() { Items = list, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯鐗╂祦淇℃伅
@@ -1058,11 +1058,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<UnitDto>> GetUnitList(GetUnitVm model)
+ public async Task<SqlSugarPagedList> GetUnitList(GetUnitVm model)
{
RefAsync<int> count = new RefAsync<int>();
var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
- return new SqlSugarPagedList<UnitDto>() { Items = list, Total = count };
+ return new SqlSugarPagedList() { Items = list, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯鍗曚綅淇℃伅
@@ -1146,11 +1146,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<PackagDto>> GetPackagList(GetPackagVm model)
+ public async Task<SqlSugarPagedList> GetPackagList(GetPackagVm model)
{
RefAsync<int> count = new RefAsync<int>();
var list = await _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, count);
- return new SqlSugarPagedList<PackagDto> { Items = list, Total = count };
+ return new SqlSugarPagedList { Items = list, Total = count };
}
/// <summary>
@@ -1212,7 +1212,7 @@
/// <returns></returns>
[HttpPost]
[ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<SqlSugarPagedList<OperationDto>> GetSysOperationList(GetOperationVm model)
+ public async Task<SqlSugarPagedList> GetSysOperationList(GetOperationVm model)
{
return await _operation.GetSysOperationList(model);
}
@@ -1238,7 +1238,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model)
+ public async Task<SqlSugarPagedList> GetInterfaceList(InterfaceVm model)
{
return await _interface.GetInterfaceList(model);
}
@@ -1249,7 +1249,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model)
+ public async Task<SqlSugarPagedList> GetInterfaceDetailList(InterfaceDetailVm model)
{
return await _interface.GetInterfaceDetailList(model);
}
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index 235d44d..3d2c74c 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -1172,11 +1172,11 @@
/// <returns>閲囪喘鍗曚俊鎭�</returns>
[HttpPost]
[ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<SqlSugarPagedList<ProcurePlanNoticeDto>> GetProcurePlanNoticeList(ProcurePlanNoticeVm model)
+ public async Task<SqlSugarPagedList> GetProcurePlanNoticeList(ProcurePlanNoticeVm model)
{
RefAsync<int> count = new RefAsync<int>();
var bolls = await _procurePlanSvc.GetProcurePlanNoticeList(model, count);
- return new SqlSugarPagedList<ProcurePlanNoticeDto>() { Items = bolls, Total = count };
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
/// 鑾峰彇閲囪喘鍗曟槑缁嗕俊鎭�
--
Gitblit v1.8.0