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

yusijie

8 天以前 24f43454989b92a251d923e23948a9af83485931

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_Add_MouldLifeChangeBillList.html

@@ -302,8 +302,7 @@
                , limit: 500 //每页默认显示的数量
            };
            //判断是否新增
            if (hID == null || hID == 0) {
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
            if (hID == null || hID == 0) {              
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
                table.render(option);
            }
@@ -412,14 +411,14 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }

                                    getHMould(checkStatus.data[0].hmainid);
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HMaterID: checkStatus.data[0].hmainid,
                                        HMaterCode: checkStatus.data[0].模具编号,
                                        HMaterName: checkStatus.data[0].模具名称,
                                        HMaterSpec: checkStatus.data[0].模具型号,
                                        HLeaveLife: checkStatus.data[0].剩余寿命,
                                        HLeaveLife: HMouldLife,
                                        HNewLeaveLife: 0,//checkStatus.data[0].HNewLife,
                                        HDesignLife: checkStatus.data[0].初始设计寿命,  //设计寿命

@@ -773,16 +772,7 @@
                }
            });





            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
            })

          
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
@@ -834,6 +824,7 @@
                }

            });

            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

@@ -850,40 +841,37 @@
                }
            });

            //#region æ ¹æ®é¡¹ç›®è´¹ç”¨åˆ†ç±»è¿”回这个分类的值
            function getHMould (HItemID) {
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldRepairInBillList/Get_HMouldLifeUsePic',
                    type: "GET",
                    async: false,
                    data: { "HItemID": HItemID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = data1.data;
                            HMouldLife=data[0].剩余寿命
                        } else {
                            layer.alert(data1.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion


        });
        //定义全局变量
        var HReasonName, ReasonID, EmpName, SQProcName,
            ProcID, ZRProcName, QRName
            ;
        function GetHReasonValue(obj)  //返回不良原因
        {
            HReasonName = obj[0].HName;
            ReasonID = obj[0].HItemID;
        }
        //返回物料
        function GetHMaterNameValue(obj) {  //返回物料
            $("#HMater").val(obj[0].HName);
            $("#HMaterID").val(obj[0].HItemID);
            $("#HMaterNumber").val(obj[0].HNumber);
        }
        //返回工序
        function GetHProcValue(obj) {  //返回工序
            $("#HProcName").val(obj[0].工序);
            $("#HProcID").val(obj[0].HItemID);
            $("#HProcNumber").val(obj[0].工序代码);
        }
        var HMouldLife;
       
        function GetHDeptNameValue(obj) {  //返回部门
            $("#HDeptName").val(obj[0].部门名称);
            $("#HDeptID").val(obj[0].HItemID);
        }
        //返回单位
        function GetHUnitNameValue(obj) {
            $("#HUName").val(obj[0].HName);
            $("#HUnitID").val(obj[0].HItemID);
            $("#HUnitNumber").val(obj[0].HNumber);
        }

    
        function GetHEmpValue(obj) {  //返回调整人
            EmpName = obj[0].HName;
            $("#HEmpName").val(obj[0].职员名称);
@@ -895,23 +883,8 @@
            $("#HMangerID").val(obj[0].HItemID);
        }
        
        //function GetHProcValue(obj) {  //返回申请工序
        //    SQProcName = obj[0].工序;
        //    ProcID = obj[0].HItemID;
        //    //$("#HSQProcName").val(obj[0].工序);
        //    //$("#HProcID").val(obj[0].HItemID);
        //}
        function GetHZRValue(obj) {   //返回责任工序
            ZRProcName = obj[0].工序;
            //$("#HZRProcName").val(obj[0].工序);
            //$("#HItemID").val(obj[0].HItemID);
        }
        //HWorker
        function GetHWorkerValue(obj) {  //返回不良确认人
            QRName = obj[0].HName;
            //$("#HQRName").val(obj[0].HName);
            //$("#HItemID").val(obj[0].HItemID);
        }
       
        
        function AllowLoadData(sSubStr) {  //非空验证
            if ($("#HDeptName").val() == '') {
                layer.msg("部门没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -934,23 +907,10 @@
                return false;
            }
            if (typeof (sSubStr) == "undefined") {
                layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                layer.msg("没有模具明细记录", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (!typeof (sSubStr) == "undefined") {
                for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
                    if (parseFloat(sSubStr[i].HQty) > 0) {
                        s = 1;
                    }
                }
                if (s == 0) {
                    layer.msg("产品入库记录未扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
            }
            else {
                return true;
            }
            return true;
        }