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

仲国强

2021-09-01 c09987510f7686f2d6a7517d427c7eda464f3e90

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

 WebTM/views/user/login.html

@@ -32,11 +32,11 @@
                </div>
                <div class="layui-form-item">
                    <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="用户名" class="layui-input" style="background-color:transparent;" autocomplete="off">
                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="用户名" class="layui-input" style="background-color:transparent;color:white !important" autocomplete="off">
                </div>
                <div class="layui-form-item">
                    <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="密码" class="layui-input" style="background-color:transparent;" autocomplete="off">
                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="密码" class="layui-input" style="background-color:transparent;color:white !important" autocomplete="off">
                </div>
                <div class="layui-form-item">
                    <button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">登 å…¥</button>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_BadReason.html

@@ -87,8 +87,8 @@
                                        <div class="layui-form-item">
                                            <label class="layui-form-label"> ç¦ç”¨æ ‡å¿—:</label>
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">
                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title=""  value="">
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
@@ -158,7 +158,8 @@
            form.on('submit(Saver)', function (data) {//保存
                
                var isEndCheck = document.getElementById("HStopflag").checked;
                data.field.HStopflag = isEndCheck;//将数组合并成字符串
                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//将数组合并成字符串

                var sMainStr = JSON.stringify(data.field);
                if (AllowLoadData()) {
                    $.ajax(
@@ -174,7 +175,6 @@
                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                }
                                else {

                                    f_alert(data.Message);
                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                }
@@ -266,7 +266,7 @@
                })
            });
            ////禁用标志
            //form.on('checkbox(checkboxHStopflag)', function (data) {
            //form.on('checkbox(HStopflag)', function (data) {
            //    $("#HStopflag").val(data.elem.checked);
            //});
            //监听提交
@@ -316,29 +316,9 @@
                            $("#HProcName").val(data.工序名称);//默认工序
                            $("#HProcID").val(data.工序ID);//工序ID
                            $("#HProcNumber").val(data.工序代码);//工序代码
                            $("input[name='HStopflag']").prop("checked", data.禁用标记);//true:选中 false:不选中
                            layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话
                            $("#HRemark").val(data.备注);//备注

                            //var IsHStopflag = data.禁用标记;
                            ////禁用标记
                            //if (IsHStopflag == "true") {
                            //    $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            //}
                            //form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            //    "HNumber": data.不良原因代码
                            //    , "HItemID": data.HItemID
                            //    , "HName": data.不良原因名称
                            //    , "HHelpCode": data.助记代码
                            //    , "HDeptNumber": data.部门代码
                            //    , "HDepName": data.部门名称
                            //    , "HDeptID": data.部门ID
                            //    , "HProcName": data.工序名称
                            //    , "HProcID": data.工序ID
                            //    , "HProcNumber": data.工序代码
                            //    , "HStopflag": data.禁用标记
                            //    , "HRemark": data.备注
                            //});
                            $("input[name='HStopflag']").attr("checked", data.禁用标记);//true:选中 false:不选中
                            layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话

                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html

@@ -144,6 +144,15 @@
                        , { field: '禁用标记', title: '禁用标记' }
                        , { field: '备注', title: '备注' }
                    ]]
                    //将禁用的数据标红
                    //, done: function (res, cuur, count) {
                    //    for (var i = 0; i < res.data.length; i++)
                    //    {
                    //        if (res.data[i].禁用标记=='Y') {
                    //            $("table tbody tr").eq(i).css('color','red')
                    //        }
                    //    }
                    //}
                };
            }
            //查询

 WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer_Edit.html

@@ -704,7 +704,7 @@
                        $("#HTaxNum").val(d.data[0].税务登记号);
                        $("#HTaxRate").val(d.data[0].增值税率);
                        $("#HEnglishName").val(d.data[0].英文名称);
                        $("#HEngLishAddress").val(d.data[0].英文地址);
                        $("#HEnglishAddress").val(d.data[0].英文地址);
                        $("#HCountry").val(d.data[0].国家);
                        $("#HCusStatus").val(d.data[0].客户状态);
                        $("input[name='HStopflag']").prop("checked", d.data[0].禁用标志);//true:选中 false:不选中

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldRepairCheckBillList.html

@@ -359,16 +359,16 @@
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始制单时间
                var EndHCreateDate = $("#EndHCreateDate").val();//结束制单时间
                if (HBillNo) {
                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HCreateBy) {
                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                    sWhere += " and åˆ¶å•äºº like '%" + HCreateBy + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存