yangle
2023-09-04 b2aa526649a7681f66e259e7e9e756e6b7bafa3e
功能优化
2个文件已修改
264 ■■■■ 已修改文件
WebTM/views/index.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html 261 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html
@@ -473,12 +473,13 @@
                                <dd>
                                    <a>工序流转</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="车间管理/工序流转卡/WindowPrint.html">测试打印</a></dd>
                                        <!--<dd><a lay-href="车间管理/工序流转卡/WindowPrint.html">测试打印</a></dd>-->
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBill.html">工序流转卡</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">工序流转卡维护</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillSubList.html">工序子流转卡维护</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/MES_SampleRecordBillList.html">试样记录单列表</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/MES_ColorRecordBillList.html">对色记录单列表</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeArrangement.html">工序流转卡排缸</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html">工序流转卡(下达)</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html">工序返工申请列表</a></dd>
                                        <!--<dd><a lay-href="车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html">工序返工申请</a></dd>-->
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Employee_Add_Edit_.html
@@ -535,7 +535,7 @@
                                        <div class="layui-col-xs8 layui-inline">
                                            <label class="layui-form-label" style="width: 12.5%;">身份证</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HIDCard" id="HIDCard" lay-verify="required|identity" autocomplete="off" style=" width: 75%;">
                                                <input class="layui-input" name="HIDCard" id="HIDCard"  autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                    </div>
@@ -598,7 +598,7 @@
                                        <div class="layui-col-xs6 layui-inline">
                                            <label class="layui-form-label" style="width: 12.5%;">银行账户</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HBankAccount" id="HBankAccount" lay-verify="required|bank" autocomplete="off" style=" width: 75%;">
                                                <input class="layui-input" name="HBankAccount" id="HBankAccount" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs6 layui-inline">
@@ -1236,137 +1236,137 @@
                    }
                }
                var HInsuranceSubsidy = $('#HInsuranceSubsidy').val();
                if (HInsuranceSubsidy.substring(HInsuranceSubsidy.length - 1, HInsuranceSubsidy.length) == ".") {
                    layer.msg("保险补贴的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HInsuranceSubsidy)) {
                        layer.msg("保险补贴请输正确入数字!");
                        return;
                    }
                }
                //var HInsuranceSubsidy = $('#HInsuranceSubsidy').val();
                //if (HInsuranceSubsidy.substring(HInsuranceSubsidy.length - 1, HInsuranceSubsidy.length) == ".") {
                //    layer.msg("保险补贴的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HInsuranceSubsidy)) {
                //        layer.msg("保险补贴请输正确入数字!");
                //        return;
                //    }
                //}
                var HOtherDeduct3 = $('#HOtherDeduct3').val();
                if (HOtherDeduct3.substring(HOtherDeduct3.length - 1, HOtherDeduct3.length) == ".") {
                    layer.msg("其他扣款3的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HOtherDeduct3)) {
                        layer.msg("其他扣款3请输正确入数字!");
                        return;
                    }
                }
                //var HOtherDeduct3 = $('#HOtherDeduct3').val();
                //if (HOtherDeduct3.substring(HOtherDeduct3.length - 1, HOtherDeduct3.length) == ".") {
                //    layer.msg("其他扣款3的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HOtherDeduct3)) {
                //        layer.msg("其他扣款3请输正确入数字!");
                //        return;
                //    }
                //}
                var HMedicare = $('#HMedicare').val();
                if (HMedicare.substring(HMedicare.length - 1, HMedicare.length) == ".") {
                    layer.msg("医疗保险的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HMedicare)) {
                        layer.msg("医疗保险请输正确入数字!");
                        return;
                    }
                }
                //var HMedicare = $('#HMedicare').val();
                //if (HMedicare.substring(HMedicare.length - 1, HMedicare.length) == ".") {
                //    layer.msg("医疗保险的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HMedicare)) {
                //        layer.msg("医疗保险请输正确入数字!");
                //        return;
                //    }
                //}
                var HInsurance = $('#HInsurance').val();
                if (HInsurance.substring(HInsurance.length - 1, HInsurance.length) == ".") {
                    layer.msg("养老保险的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HMedicare)) {
                        layer.msg("医疗保险请输正确入数字!");
                        return;
                    }
                }
                //var HInsurance = $('#HInsurance').val();
                //if (HInsurance.substring(HInsurance.length - 1, HInsurance.length) == ".") {
                //    layer.msg("养老保险的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HMedicare)) {
                //        layer.msg("医疗保险请输正确入数字!");
                //        return;
                //    }
                //}
                var HDrydock = $('#HDrydock').val();
                if (HDrydock.substring(HDrydock.length - 1, HDrydock.length) == ".") {
                    layer.msg("失业保险的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HDrydock)) {
                        layer.msg("失业保险请输正确入数字!");
                        return;
                    }
                }
                //var HDrydock = $('#HDrydock').val();
                //if (HDrydock.substring(HDrydock.length - 1, HDrydock.length) == ".") {
                //    layer.msg("失业保险的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HDrydock)) {
                //        layer.msg("失业保险请输正确入数字!");
                //        return;
                //    }
                //}
                var HBasePay = $('#HBasePay').val();
                if (HBasePay.substring(HBasePay.length - 1, HBasePay.length) == ".") {
                    layer.msg("基本工资的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HDrydock)) {
                        layer.msg("基本工资请输正确入数字!");
                        return;
                    }
                }
                //var HBasePay = $('#HBasePay').val();
                //if (HBasePay.substring(HBasePay.length - 1, HBasePay.length) == ".") {
                //    layer.msg("基本工资的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HDrydock)) {
                //        layer.msg("基本工资请输正确入数字!");
                //        return;
                //    }
                //}
                var HExamLevPostMoney = $('#HExamLevPostMoney').val();
                if (HExamLevPostMoney.substring(HExamLevPostMoney.length - 1, HExamLevPostMoney.length) == ".") {
                    layer.msg("职务考核工资的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HExamLevPostMoney)) {
                        layer.msg("职务考核工资请输正确入数字!");
                        return;
                    }
                }
                //var HExamLevPostMoney = $('#HExamLevPostMoney').val();
                //if (HExamLevPostMoney.substring(HExamLevPostMoney.length - 1, HExamLevPostMoney.length) == ".") {
                //    layer.msg("职务考核工资的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HExamLevPostMoney)) {
                //        layer.msg("职务考核工资请输正确入数字!");
                //        return;
                //    }
                //}
                var HExamRate = $('#HExamRate').val();
                if (HExamRate.substring(HExamRate.length - 1, HExamRate.length) == ".") {
                    layer.msg("带班系数的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HExamRate)) {
                        layer.msg("带班系数请输正确入数字!");
                        return;
                    }
                }
                //var HExamRate = $('#HExamRate').val();
                //if (HExamRate.substring(HExamRate.length - 1, HExamRate.length) == ".") {
                //    layer.msg("带班系数的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HExamRate)) {
                //        layer.msg("带班系数请输正确入数字!");
                //        return;
                //    }
                //}
                var HHighestPay = $('#HHighestPay').val();
                if (HHighestPay.substring(HHighestPay.length - 1, HHighestPay.length) == ".") {
                    layer.msg("最高工资的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HHighestPay)) {
                        layer.msg("最高工资请输正确入数字!");
                        return;
                    }
                }
                //var HHighestPay = $('#HHighestPay').val();
                //if (HHighestPay.substring(HHighestPay.length - 1, HHighestPay.length) == ".") {
                //    layer.msg("最高工资的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HHighestPay)) {
                //        layer.msg("最高工资请输正确入数字!");
                //        return;
                //    }
                //}
                var HOverPayRate = $('#HOverPayRate').val();
                if (HOverPayRate.substring(HOverPayRate.length - 1, HOverPayRate.length) == ".") {
                    layer.msg("超额比率的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HOverPayRate)) {
                        layer.msg("超额比率请输正确入数字!");
                        return;
                    }
                }
                //var HOverPayRate = $('#HOverPayRate').val();
                //if (HOverPayRate.substring(HOverPayRate.length - 1, HOverPayRate.length) == ".") {
                //    layer.msg("超额比率的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HOverPayRate)) {
                //        layer.msg("超额比率请输正确入数字!");
                //        return;
                //    }
                //}
                var HLeftMoneyRate = $('#HLeftMoneyRate').val();
                if (HLeftMoneyRate.substring(HLeftMoneyRate.length - 1, HLeftMoneyRate.length) == ".") {
                    layer.msg("剩余工资的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HLeftMoneyRate)) {
                        layer.msg("剩余工资请输正确入数字!");
                        return;
                    }
                }
                //var HLeftMoneyRate = $('#HLeftMoneyRate').val();
                //if (HLeftMoneyRate.substring(HLeftMoneyRate.length - 1, HLeftMoneyRate.length) == ".") {
                //    layer.msg("剩余工资的结尾不能是.!");
                //    return;
                //} else {
                //    var ref = /^[0-9]+\.?[0-9]*$/;
                //    if (!ref.test(HLeftMoneyRate)) {
                //        layer.msg("剩余工资请输正确入数字!");
                //        return;
                //    }
                //}
                //if ($("#HGroupName").val() == 0) {
                //    layer.msg("请选择班组!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1423,6 +1423,21 @@
                    layer.msg("部门不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                //if ($("#HIDCard").val() == '' || $("#HIDCard").val() == null) {
                //    layer.msg("身份证不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return Result = false;
                //}
                //if ($("#HBankAccount").val() == '' || $("#HBankAccount").val() == null) {
                //    layer.msg("银行账户不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return Result = false;
                //}
                //if ($("#HGroupName").val() == '' || $("#HGroupName").val() == null) {
                //    layer.msg("班组不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return Result = false;