Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yxj

2024-03-13 6cc377411a24d8670df93fec5d0ade664e7c5e2f

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -196,9 +196,30 @@
                                                        </button>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> ç‰©æ–™å…¬å¼ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <div class="layui-form">
                                                            <div class="layui-form-item">
                                                                <select name="HMaterRuleType" id="HMaterRuleType" lay-verify="HMaterRuleType">
                                                                    <option value="其他" selected>其他</option>
                                                                    <option value="染料">染料</option>
                                                                    <option value="助剂">助剂</option>
                                                                </select>
                                                            </div>
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>

                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> é¢œè‰²è‰²å·ï¼š</label>
                                                    <div class="layui-input-inline" style="width: 151px;">
                                                        <input type="text" value="" placeholder="请选择颜色" class="layui-input" id="HColorNo" name="HColorNo" style="width: 101px; float: left;background-color: #efefef4d;" readonly>
                                                        <div id="HColorNoName" name="HColorNoName" style="width: 50px; "></div>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> ç™½å¯è¦æ±‚：</label>
                                                    <div class="layui-input-inline ">
@@ -300,6 +321,12 @@
                                                    <label class="layui-form-label"> æœ€å¤§è®¢è´§é‡ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" > å•ä»¶æœ€å¤§ä¸Šé™ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPieceMaxQty" lay-verify="HPieceMaxQty" id="HPieceMaxQty" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
@@ -532,7 +559,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','colorpicker'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
@@ -541,6 +568,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , colorpicker = layui.colorpicker

            //初始化界面

@@ -657,6 +685,16 @@
                get_checkHQCSchemeID_Patrol();
            });

            //选择颜色
            colorpicker.render({
                elem: '#HColorNoName'
                , color: '#1c97f5'
                , done: function (color) {
                    console.log(color);
                    $('#HColorNo').val(color);
                }
            });

            //读取配置文件
            function get_ReadConfigFile() {
                //获取本地存储的数据
@@ -764,13 +802,22 @@
                                , "HWidth": data.HWidth
                                , "HWeight": data.HWeight
                                , "HColorRemark": data.染色要求
                                , "HPieceMaxQty": data.单件最大上限 == null ? "0" : data.单件最大上限
                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
                                , "HQCSchemeName_Fst": data.首件检验方案
                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
                                , "HQCSchemeName_Proc": data.转序检验方案
                                , "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
                                , "HQCSchemeName_Patrol": data.巡检检验方案
                                , "HMaterRuleType": data.物料公式
                                , "HColorNo": data.颜色色号
                            });

                            colorpicker.render({
                                elem: '#HColorNoName'
                                , color: data.颜色色号
                            });

                            console.log($('#HUnitGroupID').val());
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
@@ -804,6 +851,10 @@
                }
                if ($("#HName").val() == 0) {
                    layer.msg("请输入物料名称！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HWhID").val() == 0) {
                    layer.msg("请选择默认仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HModel").val() == 0) {
@@ -946,6 +997,18 @@
                    }
                }

                var HPieceMaxQty = $('#HPieceMaxQty').val();
                if (HPieceMaxQty.substring(HPieceMaxQty.length - 1, HPieceMaxQty.length) == ".") {
                    layer.msg("单件最大上限的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HPieceMaxQty)) {
                        layer.msg("单件最大上限请输正确入数字！");
                        return;
                    }
                }

                var HKeepDays = $('#HKeepDays').val();
                if (HKeepDays.substring(HKeepDays.length - 1, HKeepDays.length) == ".") {
                    layer.msg("保质期的结尾不能是.！");