From 94deafdd5a4fdd4a1717aead3ce542bfed5d62ea Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 26 八月 2024 09:13:05 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/ASNSetting/ProcurePlanNotice.html | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/HTML/views/ASNSetting/ProcurePlanNotice.html b/HTML/views/ASNSetting/ProcurePlanNotice.html
index 100d354..22ded55 100644
--- a/HTML/views/ASNSetting/ProcurePlanNotice.html
+++ b/HTML/views/ASNSetting/ProcurePlanNotice.html
@@ -65,9 +65,9 @@
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-inline">
- <input type="text" id="CustomerName" name="CustomerName" placeholder="瀹㈡埛鍚嶇О"
+ <input type="text" id="CustomerName" name="CustomerName" placeholder="渚涘簲鍟�"
autocomplete="off" class="layui-input">
</div>
</div>
@@ -288,11 +288,11 @@
{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', templet: '#buttonTpl' },
{ field: 'CompleteTime', title: '瀹屾垚鏃堕棿', align: 'center', templet: '#templetCompleteTime' },
{ field: 'UserName', title: '鍒跺崟浜�', align: 'center', width: 110 },
- { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 110 },
+ // { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 110 },
{ 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: '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 }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -331,6 +331,7 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
+
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
@@ -339,6 +340,7 @@
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function (res) {
+ console.log(res);
setRight();
//鑷畾涔夊垪瀹�
SetTableColW('LAY-app-content-list', 'BllAsn/GetProcurePlanNoticeList', TotalColsSysArr);
@@ -360,20 +362,20 @@
{ field: 'OrderDetailCode', title: '閲囪喘鍗曡鍙�', align: 'center', width: 100 },
{ field: 'CustomerName', title: '渚涘簲鍟嗗悕绉�', align: 'center' },
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 100 },
- { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 200 },
- { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 130 },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center' },
{ 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: '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: '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' },
+ // { 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 }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -409,6 +411,7 @@
defaultToolbar: [], //'filter','print', 'exports'
headers: { ToKen: $.cookie('token') },
page: true,
+ even: true,
limit: pageCnt,
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
@@ -430,7 +433,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