生产资源列表 新增字段 mac地址  HMacAddr varchar(100) //设备MAC地址
设备档案列表 新增字段 生产资源 HSourceID int //对应生产资源(Gy_Source)
3个文件已修改
61 ■■■■■ 已修改文件
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Source.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html
@@ -178,6 +178,12 @@
                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">mac地址</label>
                            <div class="layui-input-inline">
                            <input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">
                            </div>
                            </div>
                        </div>
                            <div class="layui-row">
                                <div class="layui-col-xs8 layui-inline">
@@ -371,6 +377,8 @@
                                , "HType": data.类型
                                , "HRemark": data.备注
                                , "HUSEORGID": data.HUSEORGID
                                , "HMacAddr": data.mac地址
                            });
                            layer.close(ajaxLoad);
                        } else {
@@ -399,7 +407,7 @@
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            ReRoadBillMain();
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html
@@ -353,7 +353,7 @@
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
                get_FastQuery(1);
            }
            //#endregion
WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html
@@ -122,6 +122,16 @@
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">生产资源</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float:left;width:150px;">
                                                    <input type="hidden" class="layui-input" name="HSourceID" id="HSourceID" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
@@ -490,7 +500,44 @@
                    }
                });
            });
            //生产资源
            form.on('submit(HSourceList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '生产资源',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //对应Erp物料
            form.on('submit(HMaterList)', function () {
                //页面层-自定义
@@ -878,6 +925,8 @@
                        $("#HProNum").val(d.data[0].工程编码);
                        $("#HWorkArea").val(d.data[0].产地);
                        $("#HLogo").val(d.data[0].品牌);
                        $("#HSourceID").val(d.data[0].HSourceID);
                        $("#HSourceName").val(d.data[0].HSourceName);
                    }
                });