Merge branch 'hwh' into Liudl

bklLiudl

2024-07-10 6d5c3dee0d97798f70bf965e48c3a782b3df9e7d

 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 == 0) //成功
                  if (res.code == 200) //成功
                  {
                     var list = res.data;
                     $.extend(infoOptions, {