增加casno等7个字段

admin

3 小时以前 7e88876cd6c68e963ec0560f4e329e5dad483d9c

 HTML/views/BaseSetting/MaterialsForm.html

@@ -10,10 +10,11 @@
      content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
   <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
   <style>
      .EditColor{
      .EditColor {
         border-color: #ed7878;
      }
      .layui-form-label{

      .layui-form-label {
         width: 70px;
      }
   </style>
@@ -27,13 +28,13 @@
            <label class="layui-form-label">物料号 <strong style="color: red;font-size: 18px;">*</strong></label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="SkuNo" placeholder="请输入物料编号" lay-verify="required" autocomplete="off"
                  class="layui-input" >
                  class="layui-input">
            </div>
         </div>
         <div class="layui-inline">
            <label class="layui-form-label">物料类别 <strong style="color: red;font-size: 18px;">*</strong></label>
            <div class="layui-input-block " style="width: 182px;">
               <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search >
               <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
                  <option value=""></option>
               </select>
            </div>
@@ -93,22 +94,24 @@
            </div>
         </div>
         <div class="layui-inline" id="IsControlledshow">
            <label class="layui-form-label">是否受控</label>
            <label class="layui-form-label">是否请验</label>
            <div class="layui-input-block" style="width: 182px;">
               <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
                  <!-- <option value=""></option> -->
                  <option value="0">受控</option>
                  <option value="1">非受控</option>
                  <option value="0">是</option>
                  <option value="1">否</option>
               </select>
            </div>
         </div>
      </div>
      <div class="layui-form-item">
         <div class="layui-inline" id="IsInspectshow">
            <label class="layui-form-label">是否免检</label>
            <label class="layui-form-label">是否受控</label>
            <div class="layui-input-block" style="width: 182px;">
               <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
                  <!-- <option value=""></option> -->
                  <option value="0">否</option>
                  <option value="1">是</option>
                  <option value="0">是</option>
                  <option value="1">否</option>
               </select>
            </div>
         </div>
@@ -125,9 +128,8 @@
         <div class="layui-inline">
            <label class="layui-form-label">单位</label>
            <div class="layui-input-block" style="width: 182px;">
               <select name="UnitNo" id="UnitNo" lay-verify="" lay-search>
                  <option value=""></option>
               </select>
               <input type="text" name="UnitNo" id="UnitNo" placeholder="请输入单位" lay-verify="" autocomplete="off"
                  class="layui-input">
            </div>
         </div>
         <!-- 包装 -->
@@ -171,9 +173,10 @@
         <div class="layui-inline">
            <label class="layui-form-label" style="width: 70px;">拆包效期(天)</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty" placeholder="请输入拆包效期" lay-verify="" autocomplete="off" class="layui-input">
               <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="UnpackWarranty"
                  placeholder="请输入拆包效期" lay-verify="" 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;">
@@ -198,7 +201,71 @@
            </div>
         </div>
      </div>
		

      <div class="layui-form-item">
         <div class="layui-inline">
            <label class="layui-form-label">CAS号</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="CasNo" id="CasNo" placeholder="请输入CAS号" lay-verify="" autocomplete="off"
                  class="layui-input">
            </div>
         </div>
         <div class="layui-inline">
            <label class="layui-form-label">是否批次管理</label>
            <div class="layui-input-block" style="width: 182px;">
               <select name="IsLotManage" id="IsLotManage" lay-verify="" lay-verify="" lay-search>
                  <!-- <option value=""></option> -->
                  <option value="0">否</option>
                  <option value="1">是</option>
               </select>
            </div>
         </div>
      </div>

      <div class="layui-form-item">
         <div class="layui-inline">
            <label class="layui-form-label">留样时间</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="LeaveTime" id="LeaveTime" placeholder="请输入留样时间" lay-verify=""
                  autocomplete="off" class="layui-input">
            </div>
         </div>
         <div class="layui-inline">
            <label class="layui-form-label">液体物料闪点</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="LiquidFlashPoint" id="LiquidFlashPoint" placeholder="请输入液体物料闪点"
                  lay-verify="" autocomplete="off" class="layui-input">
            </div>
         </div>
      </div>

      <div class="layui-form-item">
         <div class="layui-inline">
            <label class="layui-form-label">危险货位信息</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="DangerLocatInfo" id="DangerLocatInfo" placeholder="请输入危险货位信息" lay-verify=""
                  autocomplete="off" class="layui-input">
            </div>
         </div>
         <div class="layui-inline">
            <label class="layui-form-label">灭火方式</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="OutFireMethod" id="OutFireMethod" placeholder="请输入灭火方式" lay-verify=""
                  autocomplete="off" class="layui-input">
            </div>
         </div>
      </div>

      <div class="layui-form-item">
         <div class="layui-inline">
            <label class="layui-form-label">物料禁忌</label>
            <div class="layui-input-block" style="width: 182px;">
               <input type="text" name="MaterialTaboo" id="MaterialTaboo" placeholder="请输入物料禁忌" lay-verify=""
                  autocomplete="off" class="layui-input">
            </div>
         </div>
      </div>

      <div class="layui-form-item">
         <div class="layui-inline">
            <label class="layui-form-label">备注</label>
@@ -224,10 +291,17 @@
         base: '../../layuiadmin/' //静态资源所在路径
      }).extend({
         index: 'lib/index' //主入口模块
      }).use(['index', 'form', 'layer'], function () {
      }).use(['index', 'form', 'layer', 'laydate'], function () {
         var $ = layui.$,
            form = layui.form,
            layer = layui.layer;
         laydate = layui.laydate;


         laydate.render({
            elem: '#LeaveTime',
            format: 'yyyy-MM-dd' //可任意组合
         });

         // var sel3 = false;
         // //获取类别信息 CategoryNo
@@ -276,108 +350,158 @@
         });


         var sel1 = false;
         //获取单位下拉菜单 UnitNo
         synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
            if (res.code == 0) //成功
            {
               for (var i = 0; i < res.data.length; i++) {
                  $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
               }
               form.render('select');
               sel1 = true;
            }
            else //不成功
            {
               layer.msg(res.msg, {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               }, function () { sel1 = true; });
            }
         var sel1 = true;
         // //获取单位下拉菜单 UnitNo
         // synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
         //    if (res.code == 0) //成功
         //    {
         //       for (var i = 0; i < res.data.length; i++) {
         //          $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
         //       }
         //       form.render('select');
         //       sel1 = true;
         //    }
         //    else //不成功
         //    {
         //       layer.msg(res.msg, {
         //          icon: 2,
         //          time: 2000 //2秒关闭（如果不配置，默认是3秒）
         //       }, function () { sel1 = true; });
         //    }

         });
         // });

         getPackagList();
         var sel2 = false;
         //获取包装下拉菜单 PackagNo
         synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
            if (res.code == 0) //成功
            {
               for (var i = 0; i < res.data.length; i++) {
                  $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
         function getPackagList() {
            var packagList = [];

            let shouldContinue = true;
            let index = 1;
            while (shouldContinue) {
               synData(IP + "/Basis/GetPackagList?page=" + index, {}, 'get', function (res, status, error) {
                  if (res.code == 0) {
                     if (res.data.length > 0) {
                        packagList.push(res.data);
                        index++;
                     } else {
                        shouldContinue = false;
                     }
                  } else {
                     shouldContinue = false;
                  }
               });
            }
            if (packagList.length > 0) {
               for (var i = 0; i < packagList.length; i++) {
                  var itemList = packagList[i];
                  for (var j = 0; j < itemList.length; j++) {
                     $("#PackagNo").append('<option value =' + itemList[j].PackagNo + '>' + itemList[j].PackagName + '</option>');
                  }
               }
               form.render('select');
               sel2 = true;
            }
            else //不成功
            {
               layer.msg(res.msg, {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               }, function () { sel2 = true; });

            var id = getQueryString('id');
            if (!id) {
               id = 0;
               $("#AuditStatusNo").attr("disabled", "true")
            }
            else {
               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 != "") {
                           //$('#Auditishow').show();
                           // $('#IsControlledshow').show();
                           // $('#IsInspectshow').show();
                        }
                        //物料号
                        if (res.data.SkuNo != "") {
                           $("input[name='SkuNo']").attr("disabled", "disabled")
                        }
                        //页面赋值
                        $("input[name='SkuNo']").val(res.data.SkuNo); // 物料号
                        $("input[name='SkuName']").val(res.data.SkuName); // 物料名称
                        $("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"); // 是否免检
                        $("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 是否贴标
                        $("input[name='UnitNo']").val(res.data.UnitNo);
                        $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 包装
                        // $("#PackagNo").attr("disabled", "disabled")
                        $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 存储环境
                        $("input[name='Weight']").val(res.data.Weight); // 理论重量
                        $("input[name='Warranty']").val(res.data.Warranty); // 保质期
                        $("input[name='UnpackWarranty']").val(res.data.UnpackWarranty); // 保质期
                        $("input[name='Price']").val(res.data.Price); // 理论单价
                        $("input[name='AdventTime']").val(res.data.AdventTime); // 临期
                        $("input[name='LowInventory']").val(res.data.LowInventory); // 低库存

         });
                        //CAS号
                        $("input[name='CasNo']").val(res.data.CasNo);
                        //是否批次管理
                        $("#IsLotManage option[value='" + res.data.IsLotManage + "']").attr("selected", "selected");
                        //留样时间
                        $("input[name='LeaveTime']").val(res.data.LeaveTime);
                        //液体物料闪点
                        $("input[name='LiquidFlashPoint']").val(res.data.LiquidFlashPoint);
                        //危险货位信息
                        $("input[name='DangerLocatInfo']").val(res.data.DangerLocatInfo);
                        //灭火方式
                        $("input[name='OutFireMethod']").val(res.data.OutFireMethod);
                        //物料禁忌
                        $("input[name='MaterialTaboo']").val(res.data.MaterialTaboo);

         var id = getQueryString('id');
         if (!id) {
            id = 0;
            $("#AuditStatusNo").attr("disabled", "true")
         }
         else {
            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 != "") {
                        //$('#Auditishow').show();
                        // $('#IsControlledshow').show();
                        // $('#IsInspectshow').show();
                        $("textarea[name='Demo']").val(res.data.Demo); //备注
                        form.render();
                        form.render('select');
                     }
                     //物料号
                     if (res.data.SkuNo != "") {
                        $("input[name='SkuNo']").attr("disabled", "disabled")
                     else //不成功
                     {
                        layer.msg(res.msg, {
                           icon: 2,
                           time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                     }
                     //页面赋值
                     $("input[name='SkuNo']").val(res.data.SkuNo); // 物料号
                     $("input[name='SkuName']").val(res.data.SkuName); // 物料名称
                     $("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"); // 是否免检
                     $("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 是否贴标
                     $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 单位
                     $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 包装
                     // $("#PackagNo").attr("disabled", "disabled")
                     $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 存储环境
                     $("input[name='Weight']").val(res.data.Weight); // 理论重量
                     $("input[name='Warranty']").val(res.data.Warranty); // 保质期
                     $("input[name='UnpackWarranty']").val(res.data.UnpackWarranty); // 保质期
                     $("input[name='Price']").val(res.data.Price); // 理论单价
                     $("input[name='AdventTime']").val(res.data.AdventTime); // 临期
                     $("input[name='LowInventory']").val(res.data.LowInventory); // 低库存
                     $("textarea[name='Demo']").val(res.data.Demo); //备注
                     form.render();
                     form.render('select');
                  }
                  else //不成功
                  {
                     layer.msg(res.msg, {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                     }, function () { });
                  }
               });
                  });
               }

            }

            form.render('select');
         }
         form.render('select');
         //获取包装下拉菜单 PackagNo
         // synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
         //    if (res.code == 0) //成功
         //    {
         //       for (var i = 0; i < res.data.length; i++) {
         //          $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
         //       }
         //       form.render('select');
         //       sel2 = true;
         //    }
         //    else //不成功
         //    {
         //       layer.msg(res.msg, {
         //          icon: 2,
         //          time: 2000 //2秒关闭（如果不配置，默认是3秒）
         //       }, function () { sel2 = true; });
         //    }

         // });


      });

      //获取浏览器参数