From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/ASNSetting/ProcurePlanNotice.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HTML/views/ASNSetting/ProcurePlanNotice.html b/HTML/views/ASNSetting/ProcurePlanNotice.html
index fcb1f54..733b7c0 100644
--- a/HTML/views/ASNSetting/ProcurePlanNotice.html
+++ b/HTML/views/ASNSetting/ProcurePlanNotice.html
@@ -292,7 +292,7 @@
{ field: 'CreateTime', title: '涓嬪彂鏃堕棿', align: 'center', templet: '#templetCreateTime' },
{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 110 },
{ field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', templet: '#templetUpdateTime' },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 280, align: 'center', toolbar: '#toolbarDemo1', "disabled": true }
+ //{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 280, align: 'center', toolbar: '#toolbarDemo1', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -331,7 +331,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
- parseData: FnParseData,
+
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
@@ -367,15 +367,15 @@
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 70 },
{ field: 'CompleteQty', title: '瀹屾垚鏁伴噺', align: 'center', width: 90 },
{ field: 'CompleteTime', title: '瀹屾垚鏃堕棿', align: 'center', width: 160, templet: '#templetCompleteTime2' },
- { field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 90 },
- { field: 'Price', title: '鍗曚环', align: 'center', width: 65 },
- { field: 'Money', title: '閲戦', align: 'center', width: 65 },
+ //{ field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 90 },
+ //{ field: 'Price', title: '鍗曚环', align: 'center', width: 65 },
+ //{ field: 'Money', title: '閲戦', align: 'center', width: 65 },
{ field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 110, },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime2' },
{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 150, },
{ field: 'UpdateTime', title: '淇敼鏃堕棿', align: 'center', width: 150, templet: '#templetUpdateTime3' },
- { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
+ //{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -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 () {
--
Gitblit v1.8.0