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

yangle

2024-05-23 809996deb487815f964c91b3cb144d339d48c3b5

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

@@ -258,12 +258,12 @@
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
            $("h1").html('<b>' + HPageTitle + '</b>');
          //#endregion
            //#endregion

            var rowdata = [{
                "HMaterID": 0, "器具": "", "HUnitID": 0, "计量单位": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0,"HNewLeaveLife": 0, "HRemark": ""
                "HMaterID": 0, "器具": "", "HUnitID": 0, "计量单位": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HNewLeaveLife": 0, "HRemark": ""
            }];
            

            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
@@ -435,7 +435,7 @@
                    obj.update({
                        HNewLeaveLife: parseFloat(HDesignLife).toFixed(2),    //新增状态下,本次剩余寿命 = è®¾è®¡å¯¿å‘½
                    });
                } 
                }

                if ((HLeaveLife - HUseLife) < 0) {
                    layer.msg("剩余寿命不足，请重新输入！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -501,10 +501,10 @@
                        , { field: '器具', title: '器具', edit: 'text', event: "HMaterID" }//f7
                        , { field: 'HUnitID', title: 'HUnitID ', width: 100, hide: true }
                        , { field: '计量单位', title: '计量单位', edit: 'text', event: "HUnitID" }//f7
                        , { field: 'HDesignLife', title: '设计寿命', edit: 'text', totalRow: true}
                        , { field: 'HLeaveLife', title: '原剩余寿命', edit: 'text', totalRow: true}//f7
                        , { field: 'HUseLife', title: '本次耗用', edit: 'text', totalRow: true}//f7
                        , { field: 'HNewLeaveLife', title: '本次剩余寿命', totalRow: true}//f7
                        , { field: 'HDesignLife', title: '设计寿命', edit: 'text', totalRow: true }
                        , { field: 'HLeaveLife', title: '原剩余寿命', edit: 'text', totalRow: true }//f7
                        , { field: 'HUseLife', title: '本次耗用', edit: 'text', totalRow: true }//f7
                        , { field: 'HNewLeaveLife', title: '本次剩余寿命', totalRow: true }//f7
                        , { field: 'HRemark', title: '表体备注', edit: 'text' }//f7
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 80 }
                    ]]
@@ -540,7 +540,7 @@
                })
            }

            //负责人 
            //负责人
            function get_btnHManger() {
                layer.open({
                    type: 2//弹窗类型
@@ -594,6 +594,8 @@
                                    obj.update({
                                        "器具": checkStatus.data[0].模具名称
                                        , "HMaterID": checkStatus.data[0].hmainid
                                        , "HDesignLife": checkStatus.data[0].初始设计寿命
                                        , "HLeaveLife": checkStatus.data[0].剩余寿命
                                    })
                                    layer.close(index);//关闭弹窗
                                }
@@ -724,7 +726,7 @@
                            , "HDate": Format(new Date(d.data[0].日期), "yyyy-MM-dd")
                            , "HRemark": d.data[0].表头备注
                            , "HMangerID": d.data[0].HMangerID
                            , "HMangerName": d.data[0].负责人 
                            , "HMangerName": d.data[0].负责人
                            , "HDeptID": d.data[0].HDeptID
                            , "HDeptName": d.data[0].部门
                            , "HReason": d.data[0].调整原因
@@ -740,7 +742,7 @@
                                {
                                    "HMaterID": d.data[i].HMaterID, "器具": d.data[i].器具, "HUnitID": d.data[i].HUnitID, "计量单位": d.data[i].计量单位,
                                    "HDesignLife": d.data[i].设计寿命, "HLeaveLife": d.data[i].本次剩余寿命, "HUseLife": 0,
                                    "HNewLeaveLife": d.data[i].本次剩余寿命,"HRemark": d.data[i].表体备注
                                    "HNewLeaveLife": d.data[i].本次剩余寿命, "HRemark": d.data[i].表体备注
                                }
                            )
                        }