yangle
2023-09-26 1a23e4c22444224346cb4ac1adde4f5cf94bed3d
增加颜色色号
5个文件已修改
37 ■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserGroupListEdit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_RYQ.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -20,7 +20,7 @@
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//帅威
    //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一
    //public const string SqlConnStr = "Data Source=192.168.1.250;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一
    //public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//龙山汽配
    //public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
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' });
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserGroupListEdit.html
@@ -202,7 +202,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Xt_User/list',
                    type: "GET",
                    data: { "sWhere": "" },
                    data: { "sWhere": "", user: sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Sc_StationOutBill_Mul_RYQ.html
@@ -834,8 +834,6 @@
                //var sSubStr = JSON.stringify(num);
                return false;
                var HEmpName1 = $("#HEmpName1").val();  
                var HEmpName2 = $("#HEmpName2").val();
                var HEmpName3 = $("#HEmpName3").val();
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement.html
@@ -352,11 +352,11 @@
                                     res.data.forEach(function (item, index) {
                                         // console.log(item);
                                         //这里的entity_status_id ä¸ºè¡¨æ ¼æ•°æ®ä¸­çš„一列数据,用于判断特定行
                                         if (item.产品名称 != null) {
                                         if (item.颜色色号 != null && item.颜色色号 != "") {
                                             //禁用复选框,设置不可选中标识,将该行设置为阴影色
                                             var tr = $(".layui-table tr[data-index=" + index + "]");
                                             var td = tr.children('td'); //获取tr下所有的td
                                             td.eq(3).css("background-color", "#cf" + (9 - parseInt(index / 2)) + "6" + (2 + parseInt(index / 2)) + "" + (9 - index));
                                             td.eq(9).css("background-color", item.颜色色号);
                                             // tr.find("input[type='checkbox']").next().addClass('layui-btn-disabled');
                                         }
                                     })