From d5e7fc8d38fa867526c80d29c4e89792634ef690 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 01 二月 2024 14:22:55 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/BaseSetting/Materials.html | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 64e1bbf..7732a42 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -59,7 +59,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -93,8 +93,19 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <!-- 鐗╂枡绫诲埆 -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鐗╂枡绫诲埆</label>
+ <div class="layui-input-inline">
+ <select name="CategoryNo" id="CategoryNo" lay-verify="">
+ <option value=""></option>
+ </select>
+ </div>
</div>
</div>
<div class="layui-inline">
@@ -133,7 +144,7 @@
{{# } else if(d.Type=='3') { }}
<p>鑰楁潗</p>
{{# } else if(d.Type=='4') { }}
- <p>鍗婃垚鍝�</p>
+ <p>涓棿鍝�</p>
{{# } }}
</script>
@@ -192,10 +203,23 @@
laypage = layui.laypage,
layer = layui.layer;
- refreshTable("","","","","","","");
+ refreshTable("","","","","","","","");
var tableIns;
+ //鑾峰彇绫诲埆淇℃伅
+ sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
+ console.log(res)
+ if (res.code == 1) //鎴愬姛
+ {
+ Categoryhtml = '<option value =""></option>';
+ for (var i = 0; i < res.data.length; i++) {
+ Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
+ }
+ $("#CategoryNo").append(Categoryhtml);
+ form.render('select');
+ }
+ })
- function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment) {
+ function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo) {
var param = {
SkuNo: SkuNo,
SkuName: SkuName,
@@ -203,10 +227,11 @@
Type: Type,
IsControlled: IsControlled,
IsInspect: IsInspect,
- Environment: Environment
+ Environment: Environment,
+ CategoryNo:CategoryNo
};
- var url = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment;
+ 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) //鎴愬姛
{
@@ -324,6 +349,9 @@
field: 'Environment',title: '瀛樺偍鐜',align: 'center',templet: '#buttonEnvironment',width: 120
},
{
+ field: 'CategoryName',title: '鐗╂枡绫诲埆',align: 'center',width: 120
+ },
+ {
field: 'Weight',title: '鐞嗚閲嶉噺',align: 'center',width: 135
},
{
@@ -365,8 +393,9 @@
var IsControlled = data.field.IsControlled;
var IsInspect = data.field.IsInspect;
var Environment = data.field.Environment;
+ var CategoryNo = data.field.CategoryNo;
- refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment);
+ refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo);
});
var doing = true;
var $ = layui.$,
@@ -398,6 +427,7 @@
IsControlled: field.IsControlled,
IsInspect: field.IsInspect,
Origin: field.Origin,
+ CategoryNo: field.CategoryNo,
UnitNo: field.UnitNo,
PackagNo: field.PackagNo,
Environment: field.Environment,
@@ -427,7 +457,8 @@
$("#Type").val(),
$("#IsControlled").val(),
$("#IsInspect").val(),
- $("#Environment").val()
+ $("#Environment").val(),
+ $("#CategoryNo").val()
);
doing = true;
});
@@ -519,7 +550,8 @@
$("#Type").val(),
$("#IsControlled").val(),
$("#IsInspect").val(),
- $("#Environment").val()
+ $("#Environment").val(),
+ $("#CategoryNo").val()
);
//table.reload('LAY-app-content-list'); //鏁版嵁鍒锋柊
doing = true;
@@ -569,6 +601,7 @@
IsControlled: field.IsControlled,
IsInspect: field.IsInspect,
Origin: field.Origin,
+ CategoryNo: field.CategoryNo,
UnitNo: field.UnitNo,
PackagNo: field.PackagNo,
Environment: field.Environment,
@@ -599,7 +632,8 @@
$("#Type").val(),
$("#IsControlled").val(),
$("#IsInspect").val(),
- $("#Environment").val()
+ $("#Environment").val(),
+ $("#CategoryNo").val(),
);
doing = true;
});
--
Gitblit v1.8.0