From 51f7eb771322a65ee552ca9b60280632f72760e6 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 15 十月 2025 16:55:08 +0800
Subject: [PATCH] 修改物料管理列表

---
 HTML/views/BaseSetting/Materials.html |  204 +++++++++++++++++++--------------------------------
 1 files changed, 76 insertions(+), 128 deletions(-)

diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 0d65c55..b329135 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -222,6 +222,7 @@
 				laypage = layui.laypage,
 				layer = layui.layer;
 
+			var $ = layui.$;
 			var h1 = GetTableHeight();
 			refreshTable("", "", "", "", "", "", "", "");
 			var tableIns;
@@ -251,132 +252,22 @@
 					CategoryNo: CategoryNo
 				};
 
-				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 == 0) //鎴愬姛
-					{
-						var list = res.data;
-						$.extend(infoOptions, {
-							data: list
-						});
-						infoOptions.page = {
-							curr: 1
-						}
-						tableIns = table.render(infoOptions);
-					}
-					else //涓嶆垚鍔�
-					{
-						layer.msg('鑾峰彇鐗╂枡鍒楄〃淇℃伅澶辫触锛�', {
-							icon: 2,
-							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-						}, function () { });
-					}
-				});
-				sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
-					$(function () {
-						$(".approvalBtn").hide();
-					});
-					$(function () {
-						$(".approvalBtndel").hide();
-					});
-					$(function () {
-						$(".approvalBtnupt").hide();
-					});
-					if (res.code == 0) //鎴愬姛
-					{
-						for (var k = 0; k < res.data.length; k++) {
-							if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
-								$(function () {
-									$(".approvalBtn").show();
-								});
-							}
-							if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
-								$(function () {
-									$(".approvalBtndel").show();
-								});
-							}
-							if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
-								$(function () {
-									$(".approvalBtnupt").show();
-								});
-							}
-						}
-					}
-					else //涓嶆垚鍔�
-					{
-						layer.msg(
-							"鑾峰彇淇℃伅澶辫触",
-							{
-								icon: 2,
-								time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-							},
-							function () {
-								//鍥炶皟
-							}
-						);
-					}
-				});
-			}
-
-
-
-			sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
-				$(function () {
-					$(".approvalBtn").hide();
-				});
-				$(function () {
-					$(".approvalBtndel").hide();
-				});
-				$(function () {
-					$(".approvalBtnupt").hide();
-				});
-				if (res.code == 0) //鎴愬姛
-				{
-					for (var k = 0; k < res.data.length; k++) {
-						if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
-							$(function () {
-								$(".approvalBtn").show();
-							});
-						}
-						if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
-							$(function () {
-								$(".approvalBtndel").show();
-							});
-						}
-						if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
-							$(function () {
-								$(".approvalBtnupt").show();
-							});
-						}
-					}
-				}
-				else //涓嶆垚鍔�
-				{
-					layer.msg(
-						"鑾峰彇淇℃伅澶辫触",
-						{
-							icon: 2,
-							time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-						},
-						function () {
-							//鍥炶皟
-						}
-					);
-				}
-			});
-
-
-			var infoOptions = {
-				elem: "#LAY-app-content-list",
-				height: h1,
-				id: "LAY-app-content-list",
-				page: true,
-				limit: pageCnt,
-				limits: pageLimits,
-				even: true,
-				cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-				cols:
-					[[
+				table.render({
+					elem: '#LAY-app-content-list',
+					url: IP +"/Basis/GetMateList",
+					method: 'POST',
+					height: h1,//'full-'+hei1
+					id: 'LAY-app-content-list',
+					where: param,
+					contentType: 'application/json',
+					headers: { ToKen: $.cookie('token') },
+					page: true,
+					even: true,
+					limit: pageCnt,
+					limits: pageLimits,
+					cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+					even: true,
+					cols: [[
 						{
 							title: '搴忓彿', type: 'numbers', fixed: 'left', width: 65
 						},
@@ -448,8 +339,65 @@
 						{
 							title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
 						}
-					]],
-			};
+					]],parseData: function(res) { // 鏁版嵁瑙f瀽鍥炶皟
+    console.log('鍘熷杩斿洖鏁版嵁:', res);
+    return {
+      "code": res.code, // 瑙f瀽鎺ュ彛鐘舵��
+      "msg": res.msg, // 瑙f瀽鎻愮ず鏂囨湰
+      "count": res.count, // 瑙f瀽鏁版嵁闀垮害
+      "data": res.data // 瑙f瀽鏁版嵁鍒楄〃
+    };
+  },
+				});
+				
+			}
+
+
+
+			sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
+				$(function () {
+					$(".approvalBtn").hide();
+				});
+				$(function () {
+					$(".approvalBtndel").hide();
+				});
+				$(function () {
+					$(".approvalBtnupt").hide();
+				});
+				if (res.code == 0) //鎴愬姛
+				{
+					for (var k = 0; k < res.data.length; k++) {
+						if (res.data[k].MenuName == "娣诲姞鐗╂枡") {
+							$(function () {
+								$(".approvalBtn").show();
+							});
+						}
+						if (res.data[k].MenuName == "鍒犻櫎鐗╂枡") {
+							$(function () {
+								$(".approvalBtndel").show();
+							});
+						}
+						if (res.data[k].MenuName == "缂栬緫鐗╂枡") {
+							$(function () {
+								$(".approvalBtnupt").show();
+							});
+						}
+					}
+				}
+				else //涓嶆垚鍔�
+				{
+					layer.msg(
+						"鑾峰彇淇℃伅澶辫触",
+						{
+							icon: 2,
+							time: 2000, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						},
+						function () {
+							//鍥炶皟
+						}
+					);
+				}
+			});
 
 			//鐩戝惉鎼滅储
 			form.on('submit(LAY-app-contlist-search)', function (data) {

--
Gitblit v1.8.0