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

yusijie

2023-10-13 671b5af2589d1b1a0278ea2684d99e396f5aae76

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

@@ -214,6 +214,13 @@

                                            <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 ">
                                                        <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
@@ -546,7 +553,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
@@ -555,6 +562,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , colorpicker = layui.colorpicker

            //初始化界面

@@ -671,6 +679,16 @@
                get_checkHQCSchemeID_Patrol();
            });

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

            //读取配置文件
            function get_ReadConfigFile() {
                //获取本地存储的数据
@@ -785,7 +803,14 @@
                                , "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' });