yusijie
2022-12-05 76812a2c14cb1cc7b3a7b386a39a16c14d35c019
物料;汇报单;采购订单
3个文件已修改
290 ■■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html 282 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html
@@ -89,7 +89,7 @@
                                                        <label class="layui-form-label">主计量单位</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HUnitName" id="HUnitName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" id="HUnitList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
@@ -116,7 +116,7 @@
                                                        <label class="layui-form-label">计量单位组</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
@@ -183,7 +183,7 @@
                                                        <label class="layui-form-label">默认仓库</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
@@ -239,7 +239,7 @@
                                                        <label class="layui-form-label">辅助计量单位</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
@@ -366,6 +366,83 @@
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">销售计量单位</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HSALEUNITName" id="HSALEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HSALEUNITID" id="HSALEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEUNITList" id="HSALEUNITList" 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-inline">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">销售计价<br/>计量单位</label>
                                                        <div class="layui-input-inline" style="margin-top:10px">
                                                            <input type="text" readonly name="HSALEPRICEUNITName" id="HSALEPRICEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HSALEPRICEUNITID" id="HSALEPRICEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList" 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-inline">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">基本计量单位</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HBASEUNITName" id="HBASEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HBASEUNITID" id="HBASEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HBASEUNITList" id="HBASEUNITList" 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-inline">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">库存计量单位</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" readonly name="HSTOREUNITName" id="HSTOREUNITName" class="layui-input" value="" style="float: left; width: 100px;">
                                                            <input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID" class="layui-input" value="0" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSTOREUNITList" id="HSTOREUNITList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> æ ‡å‡†å·¥æ—¶ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPERUNITSTANDHOUR" lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> æ ‡å‡†äººå‘˜<br/>准备工时</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HSTDLABORPREPARETIME" lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> æ ‡å‡†æœºå™¨<br/>准备工时</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> å¤‡æ³¨ï¼š</label>
                                                    <div class="layui-input-inline ">
                                                        <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
@@ -376,6 +453,18 @@
                                                    <div class="layui-input-inline">
                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="是否禁用">
                                                        <input type="hidden" name="UnitType" id="UnitType">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">来料检验:</label>
                                                    <div class="layui-input-inline">
                                                        <input type="checkbox" name="HCHECKINCOMING" id="HCHECKINCOMING" lay-skin="primary" lay-filter="checkbox" value="true" title="是否来料检验">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">产品检验:</label>
                                                    <div class="layui-input-inline">
                                                        <input type="checkbox" name="HCHECKPRODUCT" id="HCHECKPRODUCT" lay-skin="primary" lay-filter="checkbox" value="true" title="是否产品检验">
                                                    </div>
                                                </div>
@@ -591,6 +680,15 @@
                                , "HRemark": data.备注
                                , "HEndFlag": data.明细标记
                                , "HStopFlag": data.禁用标记
                                , "HSALEUNITName": data.销售计量单位
                                , "HSALEPRICEUNITName": data.销售计价计量单位
                                , "HBASEUNITName": data.基本计量单位
                                , "HSTOREUNITName": data.库存计量单位
                                , "HCHECKINCOMING": data.是否来料检验
                                , "HCHECKPRODUCT": data.是否产品检验
                                , "HPERUNITSTANDHOUR": data.标准工时
                                , "HSTDLABORPREPARETIME": data.标准人员准备工时
                                , "HSTDMACHINEPREPARETIME": data.标准机器准备工时
                            });
                            console.log($('#HUnitGroupID').val());
                        } else {
@@ -604,6 +702,18 @@
            //保存按钮
            form.on('submit(Saver)', function (data) {
                console.log(data.field.HCHECKINCOMING)
                if (data.field.HCHECKINCOMING) {
                    data.field.HCHECKINCOMING = 1
                } else {
                    data.field.HCHECKINCOMING = 0
                }
                if (data.field.HCHECKPRODUCT) {
                    data.field.HCHECKPRODUCT = 1
                } else {
                    data.field.HCHECKPRODUCT = 0
                }
                var sMainStr = JSON.stringify(data.field);
                //var sSubStr = JSON.stringify(table.cache['mainTable']);
                //var sMainSub = sMainStr + ';' + sSubStr;
@@ -630,7 +740,8 @@
                if ($("#HSecUnitName").val() == 0) {
                    layer.msg("请选择辅助计量单位!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                }
                $.ajax(
                    {
                        type: "POST",
@@ -690,6 +801,18 @@
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HUnitName").val(checkStatus.data[0].HName);
                        $("#HUnitID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择辅助计量单位
@@ -707,6 +830,18 @@
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HSecUnitName").val(checkStatus.data[0].HName);
                        $("#HSecUnitID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
@@ -725,6 +860,18 @@
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HUnitGroupName").val(checkStatus.data[0].计量单位组);
                        $("#HUnitGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
@@ -742,9 +889,132 @@
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HWhName").val(checkStatus.data[0].HName);
                        $("#HWhID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择销售计量单位
            form.on('submit(HSALEUNITList)', function () {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
                    , title: '销售计量单位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_UnitList.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HSALEUNITName").val(checkStatus.data[0].HName);
                        $("#HSALEUNITID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择销售计价计量单位
            form.on('submit(HSALEPRICEUNITList)', function () {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
                    , title: '销售计价计量单位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_UnitList.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HSALEPRICEUNITName").val(checkStatus.data[0].HName);
                        $("#HSALEPRICEUNITID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择基本计量单位
            form.on('submit(HBASEUNITList)', function () {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
                    , title: '基本计量单位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_UnitList.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HBASEUNITName").val(checkStatus.data[0].HName);
                        $("#HBASEUNITID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //选择库存计量单位
            form.on('submit(HSTOREUNITList)', function () {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
                    , title: '库存计量单位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_UnitList.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , 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('请选择数据');
                        }
                        $("#HSTOREUNITName").val(checkStatus.data[0].HName);
                        $("#HSTOREUNITID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //清空界面
            function set_ClearBill() {
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html
@@ -114,8 +114,8 @@
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html
@@ -362,7 +362,7 @@
            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "数量": "", "HRemark": ""
                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0","HDate":""
                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0","HDate":"2022-12-05"
            }];
            // åˆå§‹åŒ–界
@@ -375,7 +375,7 @@
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "数量": "", "HRemark": ""
                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": ""
                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": "2022-12-05"
                };
                switch (obj.event) {
                    case 'btn-AddLine':