From 009e869b09a63efbc5e58e22f88ad0ed2a315e2b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 16:12:16 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/BaseSetting/MaterialsForm.html | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index bfc067e..4a9e799 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -10,12 +10,22 @@
</head>
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 0px 0 0;">
- <div class="layui-form-item">
- <label class="layui-form-label">鐗╂枡鍙�</label>
- <div class="layui-input-block" style="width: 490px;">
- <input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" lay-verify="required" autocomplete="off" class="layui-input">
+ <div class="layui-form-item" id="uptshow">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍙�</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" lay-verify="required" autocomplete="off" class="layui-input">
+ </div>
</div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡绫诲埆</label>
+ <div class="layui-input-block" style="width:182px">
+ <select name="CategoryNo" id="CategoryNo" lay-verify="" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ </div>
<!-- <div class="layui-form-item" id="uptshow">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
@@ -54,7 +64,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -79,9 +89,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸</label>
+ <label class="layui-form-label">瑙勬牸/鍨嬪彿</label>
<div class="layui-input-block" style="width: 182px;">
- <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�/鍨嬪彿" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -113,7 +123,7 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
</div>
@@ -180,6 +190,51 @@
form = layui.form,
layer = layui.layer;
+ // var sel3 = false;
+ // //鑾峰彇绫诲埆淇℃伅 CategoryNo
+ // 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++) {
+ // $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>');
+ // }
+ // form.render('select');
+ // sel3 = true;
+ // }
+ // else
+ // {
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {sel3 = true;});
+ // }
+ // })
+ var sel3 = false;
+ //鑾峰彇绫诲埆淇℃伅 CategoryNo
+ synData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
+ console.log(res)
+ if(res.code == 1) //鎴愬姛
+ {
+ for (var i = 0; i < res.data.length; i++)
+ {
+ $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>');
+ }
+ form.render('select');
+ sel3 = true;
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {sel3 = true;});
+ }
+
+ });
+
+
var sel1 = false;
//鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
synData(IP + "/Basis/GetUnitList",{},'get',function(res){
@@ -231,13 +286,14 @@
}
else
{
- if (sel1 && sel2) {
+ if (sel1 && sel2 && sel3) {
var param = {
UserId: id,
};
synData(IP + "/Basis/GetMateById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
if (res.code == 0) //鎴愬姛
{
+ // console.log(res.data.CategoryNo)
//瀹℃壒鐘舵�佺紪杈戞樉绀�
if(res.data.AuditStatusNo != "")
{
@@ -256,6 +312,8 @@
$("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
$("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected","selected"); // 瀹℃牳鐘舵��
$("#Type option[value='" + res.data.Type + "']").attr("selected","selected"); // 绫诲瀷
+ $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
+ // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
$("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected","selected"); // 鏄惁鍙楁帶
$("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected","selected"); // 鏄惁鍏嶆
$("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected","selected");// 鍗曚綅
@@ -268,6 +326,7 @@
$("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
$("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
form.render();
+ form.render('select');
}
else //涓嶆垚鍔�
{
--
Gitblit v1.8.0