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

yusijie

2023-04-25 68fcb32bf7599f5387b77e2168c8fd692c0ecbfd

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

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

@@ -777,6 +777,175 @@
                        return;
                    }
                }

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

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

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

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

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

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

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

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

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

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

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

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

                var HSTDLABORPREPARETIME = $('#HSTDLABORPREPARETIME').val();
                if (HSTDLABORPREPARETIME.substring(HSTDLABORPREPARETIME.length - 1, HSTDLABORPREPARETIME.length) == ".") {
                    layer.msg("标准人员准备工时的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HSTDLABORPREPARETIME)) {
                        layer.msg("标准人员准备工时请输正确入数字！");
                        return;
                    }
                }

                var HSTDMACHINEPREPARETIME = $('#HSTDMACHINEPREPARETIME').val();
                if (HSTDMACHINEPREPARETIME.substring(HSTDMACHINEPREPARETIME.length - 1, HSTDMACHINEPREPARETIME.length) == ".") {
                    layer.msg("标准机器准备工时的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    if (!ref.test(HSTDMACHINEPREPARETIME)) {
                        layer.msg("标准机器准备工时请输正确入数字！");
                        return;
                    }
                }

                //if ($("#HUnitGroupName").val() == 0) {
                //    layer.msg("请选择计量单位组！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;

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

@@ -321,6 +321,44 @@
                    layer.msg("请输入高！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }


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

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

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

                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_PackType/ModifyByID", //方法所在页面和方法名

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

@@ -232,6 +232,66 @@

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {

                var HYear = $('#HYear').val();
                if (HYear.substring(HYear.length - 1, HYear.length) == ".") {
                    layer.msg("年份的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HYear)) {
                        layer.msg("年份请输正确入数字！");
                        return;
                    }
                }

                var HPeriod = $('#HPeriod').val();
                if (HPeriod.substring(HPeriod.length - 1, HPeriod.length) == ".") {
                    layer.msg("月份的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HPeriod)) {
                        layer.msg("月份请输正确入数字！");
                        return;
                    }
                }

                var HWorkTimes = $('#HWorkTimes').val();
                if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
                    layer.msg("基本天数的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HWorkTimes)) {
                        layer.msg("基本天数请输正确入数字！");
                        return;
                    }
                }

                var HOverWorkTimes = $('#HOverWorkTimes').val();
                if (HOverWorkTimes.substring(HOverWorkTimes.length - 1, HOverWorkTimes.length) == ".") {
                    layer.msg("加班天数的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HOverWorkTimes)) {
                        layer.msg("加班天数请输正确入数字！");
                        return;
                    }
                }

                var HBasePay = $('#HBasePay').val();
                if (HBasePay.substring(HBasePay.length - 1, HBasePay.length) == ".") {
                    layer.msg("基本工资的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HBasePay)) {
                        layer.msg("基本工资请输正确入数字！");
                        return;
                    }
                }
              
                var sMainStr = JSON.stringify(data.field);
                $.ajax({

 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" autocomplete="off" style=" width: 75%;">
                                                <input class="layui-input" name="HIDCard" id="HIDCard" lay-verify="required|identity" 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" autocomplete="off" style=" width: 75%;">
                                                <input class="layui-input" name="HBankAccount" id="HBankAccount" lay-verify="required|bank" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs6 layui-inline">
@@ -619,20 +619,6 @@
                                            <label class="layui-form-label" style="width: 12.5%;">医疗保险</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HMedicare" id="HMedicare" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <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="HInsurance" id="HInsurance" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                        <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="HDrydock" id="HDrydock" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>
                                    </div>
@@ -1225,6 +1211,163 @@
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                var HAge = $('#HAge').val();
                if (HAge.substring(HAge.length - 1, HAge.length) == ".") {
                    layer.msg("年龄的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HAge)) {
                        layer.msg("年龄请输正确入数字！");
                        return;
                    }
                }

                var HContractYear = $('#HContractYear').val();
                if (HContractYear.substring(HContractYear.length - 1, HContractYear.length) == ".") {
                    layer.msg("合同期限的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HContractYear)) {
                        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 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 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 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 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 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: "温馨提示" });
                //    return;

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

@@ -55,14 +55,14 @@
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">代码：</label>
                                                    <label class="layui-form-label">代码：*</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                        <input id="HItemID" name="HItemID" type="hidden" />
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">名称：</label>
                                                    <label class="layui-form-label">名称：*</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                    </div>
@@ -95,7 +95,7 @@
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">使用组织：</label>
                                                    <label class="layui-form-label">使用组织：*</label>
                                                    <div class="layui-input-inline">
                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                        </select>
@@ -264,11 +264,11 @@

        //保存
        function Saver(data) {
            if ($("#HNumber").val() == 0) {
            if ($("#HNumber").val() == "") {
                layer.msg("请输入代码！");
                return;
            }
            if ($("#HName").val() == 0) {
            if ($("#HName").val() == "") {
                layer.msg("请输入名称！");
                return;
            }

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MatePriceSupEdit.html

@@ -308,6 +308,19 @@

        //保存HMaker
        function set_AddNew(data) {

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

            var sMainStr = JSON.stringify(data.field);
            var sMainSub = sMainStr  + ";" + sessionStorage["HUserName"];


 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_TaxRateEdit.html

@@ -196,6 +196,19 @@

        //保存HMaker
        function set_AddNew(data) {

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

            var sMainStr = JSON.stringify(data.field);
            var sMainSub = sMainStr  + ";" + sessionStorage["HUserName"];


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

@@ -789,6 +789,19 @@
                    layer.msg("请输入客户名称！", { icon: 5 });
                    return false;
                }

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

                //var HTaxRate = $("#HTaxRate").val();
                //if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
                //    layer.msg("增值税率不得为空！", { icon: 5 });

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit.html

@@ -314,7 +314,21 @@
                    }
                });
            }
            else {//如果修改则走下面
            else if (OperationType == 2)
            {
                RoadBillMain(linterid);
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3710' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                    }
                });
            }
            else if(OperationType == 3)
            {//如果修改则走下面
                //禁用组织选项
                $("#HPRDORGID").attr("disabled", true);
                $("#HDate").attr("disabled", true);
@@ -881,14 +895,14 @@
                            , "HPlanQty": d.data[0].计划生产数量
                            , "HPRDORGID": d.data[0].HPRDORGID
                            //其他信息
                            , "hmakers": d.data[0].制单人
                            , "hmakedate": d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")
                            , "hchecker": d.data[0].审核人
                            , "hcheckdate": d.data[0].审核日期 == null ? "" : Format(new Date(d.data[0].审核日期), "yyyy-MM-dd")
                            , "hupdater": d.data[0].修改人
                            , "hupdatedate": d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hdeleteman": d.data[0].作废人
                            , "hdeletedate": d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                            , "hmakers": OperationType == 2 ? "" :d.data[0].制单人
                            , "hmakedate": OperationType == 2 ? "" :d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")
                            , "hchecker": OperationType==2?"":d.data[0].审核人
                            , "hcheckdate": OperationType == 2 ? "" :d.data[0].审核日期 == null ? "" : Format(new Date(d.data[0].审核日期), "yyyy-MM-dd")
                            , "hupdater": OperationType == 2 ? "" : d.data[0].修改人
                            , "hupdatedate": OperationType == 2 ? "" : d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hdeleteman": OperationType == 2 ? "" :d.data[0].作废人
                            , "hdeletedate": OperationType == 2 ? "" : d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                        });

                        //子表  èµ‹å€¼

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -437,7 +437,19 @@
                    }
                });
            }
            else {//如果修改则走下面
            else if (OperationType==2) {
                RoadBillMain(linterid);
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3710' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                    }
                });
            }
            else if (OperationType == 3) {//如果修改则走下面
                //禁用组织选项
                $("#HPRDORGID").attr("disabled", true);
                $("#HDate").attr("disabled", true);
@@ -980,14 +992,14 @@
                            , "HWeight": d.data[0].HWeight
                            , "HColorRemark": d.data[0].染色要求
                            //其他信息
                            , "hmakers": d.data[0].制单人
                            , "hmakedate": d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")
                            , "hchecker": d.data[0].审核人
                            , "hcheckdate": d.data[0].审核日期 == null ? "" : Format(new Date(d.data[0].审核日期), "yyyy-MM-dd")
                            , "hupdater": d.data[0].修改人
                            , "hupdatedate": d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hdeleteman": d.data[0].作废人
                            , "hdeletedate": d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                            , "hmakers": OperationType == 2 ? "" :d.data[0].制单人
                            , "hmakedate": OperationType == 2 ? "" : d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")
                            , "hchecker": OperationType == 2 ? "" :d.data[0].审核人
                            , "hcheckdate": OperationType == 2 ? "" : d.data[0].审核日期 == null ? "" : Format(new Date(d.data[0].审核日期), "yyyy-MM-dd")
                            , "hupdater": OperationType == 2 ? "" : d.data[0].修改人
                            , "hupdatedate": OperationType == 2 ? "" :d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hdeleteman": OperationType == 2 ? "" : d.data[0].作废人
                            , "hdeletedate": OperationType == 2 ? "" :d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                        });
                        form.render('select');
                       

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -167,8 +167,10 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>批量下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>新增(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit_NT"><i class="layui-icon layui-icon-form"></i>编辑(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy_NT"><i class="layui-icon layui-icon-form"></i>复制(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -259,11 +261,17 @@
                    //编辑
                    case 'set_Edit': set_Edit();
                        break;
                    //复制
                    case 'set_copy': set_copy();
                        break;
                    //新增(无列表)
                    case 'set_AddNew_NT': set_AddNew_NT();
                        break;
                    //编辑(无列表)
                    case 'set_Edit_NT': set_Edit_NT();
                        break;
                    //复制(无列表)
                    case 'set_copy_NT': set_copy_NT();
                        break;
                    //审核
                    case 'set_CheckBill': set_CheckBill();
@@ -740,6 +748,29 @@
                }
            }

            // å¤åˆ¶
            function set_copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产订单编辑'
                        , shift: 0//弹出动画
                        , content: '../生产任务单/Sc_ICMOBillEdit.html?OperationType=2&linterid=' + linterid + ''
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //新增(无列表)
            function set_AddNew_NT() {
                layer.open({
@@ -780,6 +811,30 @@
                }
            }

            // å¤åˆ¶(无列表)
            function set_copy_NT() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    var HEntryID = data[0].hsubid;

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产订单编辑'
                        , shift: 0//弹出动画
                        , content: '../生产任务单/Sc_ICMOBillEdit_NoTable.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -400,6 +400,9 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>上一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>下一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh"><i class="layui-icon layui-icon-form"></i>刷新流水号</button>
                        </div>
                    </script>
                </form>
@@ -896,7 +899,19 @@
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                        break; 
                    //上一行
                    case 'btn_up':
                        btn_up(data);
                        break; 
                    //下一行
                    case 'btn_under':
                        btn_under(data);
                        break; 
                    //刷新流水号
                    case 'btn_Refresh':
                        btn_Refresh(data);
                        break; 
                }
            });

@@ -2068,6 +2083,54 @@
                })
            }

            //上一行
            function btn_up(data) {
                if (data.length != 1) {
                    layer.msg("请选择一行数据！");
                } else if (option.data[0]["HProcNo"] == data[0]["HProcNo"]) {
                    layer.msg("首行数据无法移动！");
                } else {
                    var tables = [];
                    for (var i = 0; i < option.data.length; i++) {
                        if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
                            tables.push(option.data[i - 1]);
                            option.data[i - 1] = data[0];
                            option.data[i] = tables[0];
                            table.render(option);
                            break;
                        }
                    }
                }
            }

            //下一行
            function btn_under(data) {
                if (data.length != 1) {
                    layer.msg("请选择一行数据！");
                } else if (option.data[option.data.length-1]["HProcNo"] == data[0]["HProcNo"]) {
                    layer.msg("末行数据无法移动！");
                } else {
                    var tables = [];
                    for (var i = 0; i < option.data.length; i++) {
                        if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
                            tables.push(option.data[i + 1]);
                            option.data[i + 1] = data[0];
                            option.data[i] = tables[0];
                            table.render(option);
                            break;
                        }
                    }
                }
            }

            //刷新流水号
            function btn_Refresh(data) {
                for (var i = 0; i < option.data.length; i++) {
                    option.data[i]["HProcNo"] = (i + 1) * 10;
                }
                table.render(option);
            }

            //显示列数据
            function DisPlay_HideColumn() {
                $.ajax({

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA_QiaoYi.html

@@ -1035,7 +1035,7 @@
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrg": data.组织,
                                        "HPRDOrgID": data.组织,
                                        "HQty": data.流转卡数量,
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].出站关联数量 ? data.流转卡数量: result.data[1].出站关联数量): data.流转卡数量,
                                      
                                    });

@@ -1100,6 +1100,14 @@
                                                        , { field: '工艺参数', title: '工艺参数' }
                                                    ]]
                                                    , height: 500
                                                    , done: function (res, curr, count) {
                                                        for (var i in res.data) {
                                                            var item = res.data[i];
                                                            if (item["流水号"] == $("#HProcNo").val()) {
                                                                $("tr[data-index='" + i + "']").attr({ "style": "background-color:red;" });
                                                            }
                                                        }
                                                    }
                                                }
                                                table.render(option)
                                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA_QiaoYi.html

@@ -432,7 +432,7 @@
            var FirstEndHProcNo = 0; // é»˜è®¤0  é¦–道工序1 æœ«é“工序2

            $('#Detail').addClass("layui-btn-disabled").attr("disabled", true);//禁用明细按钮
            $("#Add").attr("style", "display:none;");//隐藏新增按钮
           /* $("#Add").attr("style", "display:none;");//隐藏新增按钮*/
            /*固定代码，每张单据都要begin*/
            /* 1.无源单新增
             * 2.有源单新增
@@ -686,6 +686,9 @@
            });

            function txtHBarCode_KeyDown(HBarCode) {
                if (HBarCode == "") {
                    return;
                }
                //扫码类型1
                var barNo = HBarCode.substr(0, 3);
                 //扫码类型2
@@ -755,7 +758,7 @@
                                        "HCenterID": data.HCenterID,
                                        "lngBillSubKey": data.hsubid,
                                        //"NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量),
                                        "HQty": data.流转卡数量,
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
                                    });
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
@@ -816,6 +819,14 @@
                                            , { field: '工艺参数', title: '工艺参数' }
                                        ]]
                                        , height: 500
                                        , done: function (res, curr, count) {
                                            for (var i in res.data) {
                                                var item = res.data[i];
                                                if (item["流水号"] == $("#HProcNo").val()) {
                                                    $("tr[data-index='" + i + "']").attr({ "style": "background-color:red;" });
                                                }
                                            }
                                        }
                                    }
                                    table.render(option)
                                    break;
@@ -1155,6 +1166,9 @@

            function txtHProcNo_KeyDown(sBillNo, sProcNo) {
                var index = layer.load();
                if (sBillNo == "") {
                    return;
                }
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi",
                    type: "GET",
@@ -1360,19 +1374,19 @@
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                            $("#Add").attr("style", "display:inline;");//显示新增按钮
                            //$("#Add").attr("style", "display:inline;");//显示新增按钮
                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//禁用保存按钮
                            if (sessionStorage["OrganizationID"] == 100038) {
                                if (FirstEndHProcNo == 1) {
                                    //汇报
                                    GetInStorage();
                                } else if (FirstEndHProcNo == 2) {
                                    //入库
                                    BtnRK();
                                    //报废
                                    BtnBF();
                                }
                            }
                            //if (sessionStorage["OrganizationID"] == 100038) {
                            //    if (FirstEndHProcNo == 1) {
                            //        //汇报
                            //        GetInStorage();
                            //    } else if (FirstEndHProcNo == 2) {
                            //        //入库
                            //        BtnRK();
                            //        //报废
                            //        BtnBF();
                            //    }
                            //}

                            var HMaterID = $("#HMaterID").val();
                            var HWorkProcID = $("#HProcID").val();

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -1005,6 +1005,21 @@
                set_EditFromGrid();

            }
            else if (OperationType == 4) {//复制
                set_EditFromGrid();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3772' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
            }
            else {
                layer.alert("未知操作类型！", { icon: 5 });
            }
@@ -1993,8 +2008,8 @@
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_ProcessExchangeBillQuery[0];
                            form.val("component-form-group", {
                                "HBillNo": data.单据号
                                , "HInterID": data.hmainid
                                "HBillNo": OperationType==4?"": data.单据号
                                , "HInterID": OperationType == 4 ? "" : data.hmainid
                                , "HPRDORGID": data.HPRDORGID
                                , "HDate": formatDate(data.日期)
                                , "HOrderProcNO": data.订单跟踪号

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -127,6 +127,7 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_cf"><i class="layui-icon layui-icon-form"></i>拆分</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>打印</button>
@@ -226,7 +227,10 @@
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                        break; 
                    //复制
                    case 'set_Copy': set_Copy();
                        break; 
                    //拆分
                    case 'set_cf': set_cf();
                        break;
@@ -1522,6 +1526,25 @@
                }
            }

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid;
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序流转卡-编辑'
                        , shift: 0//弹出动画
                        , content: '../工序流转卡/Sc_ProcessExchangeBill.html?OperationType=4&linterid=' + linterid + '&HEntryID=&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //拆分
            function set_cf() {
                var checkStatus = table.checkStatus('mainTable')