Merge branch 'yyk'

yuyou_x

2024-03-07 e701bbb0b83037cb945cdd66d7f943b68c88f004

 HTML/views/ASNSetting/SelMaterials.html

@@ -21,12 +21,18 @@
                     </div>
                  </div>
                  <div class="layui-inline">
                     <label class="layui-form-label">物料类型</label>
                     <label class="layui-form-label">单据类型</label>
                     <div class="layui-input-inline">
                        <select name="IsControlled" id="IsControlled" lay-filter="IsControlled" disabled="disabled"
                        <select name="Type" id="Type" lay-filter="Type" disabled="disabled"
                           lay-search>
                           <option value="0">标准物料</option>
                           <option value="1">非标物料</option>
                           <option value="0">成品入库</option>
                           <option value="1">采购入库</option>					
                           <option value="2">中间品入库</option>
                           <option value="3">退货入库</option>
                           <option value="4">车间余料退回入库</option>
                           <option value="5">其它入库</option>
                           <option value="6">代储入库</option>
                           <option value="7">寄存入库</option>
                        </select>
                     </div>
                  </div>
@@ -72,18 +78,20 @@

               if (r != null)
               {
                  $("#IsControlled").empty();
                  if (unescape(r[2]) == 0)
                  {
                     $("#IsControlled").append('<option value ="0" Selected >标准物料</option>');
                     $("#IsControlled").append('<option value ="1">非标物料</option>');
                  }
                  if (unescape(r[2]) == 1)
                  {
                     $("#IsControlled").append('<option value ="0">标准物料</option>');
                     $("#IsControlled").append('<option value ="1" Selected >非标物料</option>');
                  }
                  // $("#Type").empty();
                  // if (unescape(r[2]) == 0)
                  // {
                  //    $("#Type").append('<option value ="0" Selected >标准物料</option>');
                  //    $("#Type").append('<option value ="1">非标物料</option>');
                  // }
                  // if (unescape(r[2]) == 1)
                  // {
                  //    $("#Type").append('<option value ="0">标准物料</option>');
                  //    $("#Type").append('<option value ="1" Selected >非标物料</option>');
                  // }

						
                  $("#Type").val(unescape(r[2])); // "optionValue"为需要被选中的选项的value属性值
                  form.render('select');
               } 

@@ -117,7 +125,7 @@
            function refreshTable() {
               var param = {
                  SkuNo:  $("#Msg").val(),
                  IsControlled: $("#IsControlled").val()
                  Type: $("#Type").val()
               };

               sendData(IP + "/BllAsn/GetMaterialsList", param, 'post', function(res) {