Bug修复器具+设备

zzr99

2021-12-07 a8adb68c4f8c22cf15e36bebbdc451e4b1b1d52f

Bug修复器具+设备

 WebTM/views/PublicPage/MouldInformation.html

@@ -149,6 +149,9 @@
                    , { field: 'HNumber', title: '模具代码' }
                    , { field: 'HName', title: '模具名称' }
                    , { field: 'HModel', title: '模具规格' }
                    , { field: 'HDesignLife', title: '设计寿命' }
                    , { field: 'HLeaveLife', title: '剩余寿命' }
                    , { field: 'HUseLife', title: '使用寿命' }
                ]]
            };


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

@@ -145,8 +145,10 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
    //获取参数
        //获取参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -337,8 +339,9 @@
                                        HMaterCode: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName,
                                        HMaterSpec: checkStatus.data[0].HModel,

                                        HDesignLife: 0,  //设计寿命
                                        HLeaveLife: checkStatus.data[0].HLeaveLife,
                                        HNewLife: checkStatus.data[0].HNewLife,
                                        HDesignLife: checkStatus.data[0].HDesignLife,  //设计寿命

                                    });

@@ -486,7 +489,7 @@

            function RoadBillMain(hID)//加载表头
            {
                alert(hID);
               
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai",
@@ -670,8 +673,15 @@


            form.on('submit(Exit)', function (data) {//
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
                if (OperationType == 1) {
                    Pub_Close(closeType);//直接新增closeType值为2，列表调新增closeType值从列表传递
                }
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                }
                else {
                    Pub_Close(2);
                }
            });



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

@@ -442,7 +442,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + '/Gy_Material/InitializeProdInBill',
                            data: { "hmainid": HInterID, "user": sessionStorage["HUserName"] },
                            data: { "hmainid": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

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

@@ -930,9 +930,9 @@
                                , "HExplanation": data.维修要求
                                , "HRemark": data.备注
                                , "HMainSourceBillType": data.HMainSourceBillType
                                , "HMainSourceBillNo": data.源单单号
                                , "HMainSourceInterID": data.源单主内码
                                , "HMainSourceEntryID": data.源单子类码
                                , "HMainSourceBillNo": data.HMainSourceBillNo
                                , "HMainSourceInterID": data.HMainSourceInterID
                                , "HMainSourceEntryID": data.HMainSourceEntryID

                            });


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

@@ -197,7 +197,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HUnitID": "0 ","HUnitNumber":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " };
                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -241,7 +241,9 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID,
                                        HMaterNumber: checkStatus.data[0].HNumber
                                        HMaterNumber: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName

                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -276,7 +278,8 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HUnitID: checkStatus.data[0].HItemID,
                                        HUnitNumber: checkStatus.data[0].HNumber
                                        HUnitNumber: checkStatus.data[0].HNumber,
                                        HUnitName: checkStatus.data[0].HName
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -374,7 +377,6 @@
                //常规用法
                laydate.render({
                    elem: '#HDate'

                });
                laydate.render({
                    elem: '#HBeginDate'
@@ -418,7 +420,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HUnitID": "0 ", "HUnitNumber": "", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " }];
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark" }];
                table.render(option);
            }

@@ -426,7 +428,7 @@
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HUnitID": "0 ", "HUnitNumber": "", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " }];
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark"}];
                table.render(option);
            }

@@ -473,6 +475,7 @@
                                , "HEndDate": data.计划结束日期
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                                

                            });


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

@@ -24,7 +24,7 @@
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <form  class="layui-form" lay-filter="component-form-group" id="component-form-group"  action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckPlanBillList.html

@@ -211,7 +211,7 @@
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160, hide: true }
                        , { field: '设备代码', title: '设备代码', width: 200 }
                        , { field: '设备名称', title: '设备名称', width: 200, hide: true }
                        , { field: '设备名称', title: '设备名称', width: 200 }
                        , { field: '表头备注', title: '表头备注', width: 200, hide: true }
                        , { field: '开始日期', title: '开始日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"}
                        , { field: '结束日期', title: '结束日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleEdit.html

@@ -374,7 +374,36 @@
                    }
                });
            }

            //增加一行
            function btnAddLine(NewRow) {
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                buttonArr = [];//清空数组
                for (var i = 0; i < tableBak.length; i++) {
                    buttonArr.push(tableBak[i]);  //将之前的数据存储
                }
                buttonArr.push(NewRow);  //在尾部加一行
                table.reload("mainTable", {
                    data: buttonArr    //将数据重新载入表格
                })
            }
            //复制一行
            function btnCopyLine(data) {
                var copydata = JSON.stringify(data);
                if (data.length <= 0) {
                    layer.alert("请选择需要复制的一行！");
                }
                else if (data.length > 1) {
                    layer.alert("只能选择复制一行！");
                }
                else {
                    var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                    var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                    table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    table.render(option);//将数据渲染到表格上
                    //layer.alert(copyrow);
                }
            }
            //编辑
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头