王 垚
2021-10-11 8db34c61053b8a622f363db880ce3150c6e9ecee
器具采购入库单
增加字段 仓位 往来单位
页面问题修复 保存验证登
2个文件已修改
118 ■■■■■ 已修改文件
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillEdit.html
@@ -125,6 +125,29 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">往来类型</label>
                                                <div class="layui-input-inline">
                                                    <select name="HSupTypeID" id="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
                                                        <option value="1">供应商</option>
                                                        <option value="2">客户</option>
                                                        <option value="3">车间部门</option>
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">往来单位</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" 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">
                                                <label class="layui-form-label">选单号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
@@ -174,10 +197,12 @@
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
            var closeType = 2;  //关闭类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
            var closeType = params[params[3]];  //关闭类型
        }
@@ -198,7 +223,7 @@
            var option = [];
            var sWhere = "";
            var sBillType = "3801";
            TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0,"HQtyMust":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "",  "HRemark": "" };
            TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
            //#endregion
@@ -389,6 +414,45 @@
                    }
                });
            });
            //表头信息往来单位弹窗
            form.on('submit(HSupList)', function () {
                //页面层-自定义
                var url = '../../PublicPage/' + getSupType() + '.html';
                //alert(url);
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '往来单位列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: [url, '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('请选择数据');
                        }
                        $("#HSupName").val(checkStatus.data[0].HName);
                        $("#HSupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //保存
            form.on('submit(Saver)', function (data) {
                var refSav = "";
@@ -438,9 +502,18 @@
                    });
            });
            //退出
            form.on('submit(Exit)', function (data) {//
                Pub_Close(1);
            form.on('submit(Exit)', function (data) {
                if (OperationType == 1) {
                    Pub_Close(closeType);//直接新增closeType值为2,列表调新增closeType值从列表传递
                }
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                }
                else {
                    Pub_Close(2);
                }
            });
            //预览
            form.on("submit(planview)", function (data) {
@@ -587,6 +660,9 @@
                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
                    , { field: 'HWHCode', title: '收料仓库代码', edit: 'text', event: 'HWHCode', width: 100 }
                    , { field: 'HWHName', title: '收料仓库名称', edit: 'text', width: 100 }
                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
                    , { field: 'HSPCode', title: '收料仓位代码', edit: 'text', event: 'HSPCode', width: 100 }
                    , { field: 'HSPName', title: '收料仓位名称', edit: 'text', width: 100 }
                    , { field: 'HRemark', title: '备注', edit: 'text', width: 100 }
                ];
                option = {
@@ -649,8 +725,8 @@
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HInnerBillNo": data.内部单据号
                                , "HWHID": data.hwhid                    //仓库ID
                                , "HWHName": data.收料仓库               //仓库名称
                                , "HWHID": data.HWHID                    //仓库ID
                                , "HWHName": data.仓库                   //仓库名称
                                , "HSecManagerID": data.hsecmanagerid    //验收员ID
                                , "HSecManagerName": data.验收员         //验收员名称
                                , "HKeeperID": data.hkeeperid            //保管员ID
@@ -1017,12 +1093,20 @@
            //非空验证
            function AllowLoadData(sSubStr) {
                var Result = true;
                if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
                    layer.msg("仓库不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
                    layer.msg("验收员不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
                    layer.msg("保管员不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                    layer.msg("部门不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
@@ -1037,6 +1121,10 @@
                            layer.msg("明细记录第" + (i + 1) + "行,器具信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HWHID == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,收料仓库为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                    }
                }
                else {
@@ -1045,6 +1133,21 @@
                return Result;
            }
            //#endregion
            function getSupType() {
                var type = $("#HSupTypeID").val();
                console.log(type)
                switch (type) {
                    case '1':
                        return "SupplierInformation";
                        break;
                    case '2':
                        return "CustomerInformation";
                        break;
                    case '3':
                        return "DeptInformation";
                        break;
                }
            }
        });
    </script>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillList.html
@@ -173,7 +173,7 @@
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                    , { field: 'hmainid', title: '单据ID', width: 200, hide: true }
                    , { field: '日期', title: '日期', width: 200, sort: true }
                    , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: '单据号', title: '单据号', width: 200, sort: true }
                    , { field: 'HBillType', title: '单据类型', width: 200,hide: true}
                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
@@ -191,6 +191,9 @@
                    , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                    , { field: '收料仓库代码', title: '仓库代码', width: 200 }
                    , { field: '收料仓库', title: '仓库名称', width: 200 }
                    , { field: 'HSPID', title: 'HWHID', width: 200, hide: true }
                    , { field: '收料仓位代码', title: '仓位代码', width: 200 }
                    , { field: '收料仓位', title: '仓位名称', width: 200 }
                    , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
                    , { field: '验收员代码', title: '验收员代码', width: 200 }
                    , { field: '验收员', title: '验收员名称', width: 200 }