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

yangle

2024-06-11 865eb3bcd1a25d5f9233f85c2549c6fe3da3ceb0

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -101,7 +101,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label"  style="width: 60px;">销售订单类型</label>
                                            <label class="layui-form-label" style="width: 60px;">销售订单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="HMainSourceBillSubType" id="HMainSourceBillSubType" lay-filter="HMainSourceBillSubType" disabled="disabled" style="width: 180px; ">
                                                    <option style="color:blue;" selected="selected" value=""></option>
@@ -266,6 +266,24 @@
                                            <label class="layui-form-label" style="width: 85px;">生产克重</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 50px;">辅数量2</label>
                                            <div class="layui-input-inline" style="margin-left: 1px;">
                                                <input type="text" class="layui-input" name="HAuxQty2" lay-verify="HAuxQty2" style="width:70px" id="HAuxQty2" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="margin-left:-140px;">
                                            <label class="layui-form-label" style="width: 30px;">辅助单位2</label>
                                            <div class="layui-input-inline" style="margin-left: 1px;margin-top:10px;">
                                                <input type="text" class="layui-input" lay-verify="HAuxUnitName2" name="HAuxUnitName2" id="HAuxUnitName2" style="background-color:#efefef4d;width: 30%;display: inline-block;" readonly>
                                                <input type="hidden" name="HAuxUnit2" id="HAuxUnit2" lay-verify="HAuxUnit2" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit2" id="btnHAuxUnit2" style="padding: 0 10px;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -613,6 +631,11 @@
            //选择辅助单位按钮
            form.on('submit(btnHAuxUnit)', function () {
                get_btnHAuxUnit();
            });

            //选择辅助单位2按钮
            form.on('submit(btnHAuxUnit2)', function () {
                get_btnHAuxUnit2();
            });

            //选择BOM按钮
@@ -998,6 +1021,32 @@
                })
            }

            //辅助单位2
            function get_btnHAuxUnit2() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: "计量单位列表"  //标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Unit.html?type=AuxiliaryUnit2', '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('请选择数据');
                        }
                        //获取数据
                        $("#HAuxUnit2").val(checkStatus.data[0].HItemID);
                        $("#HAuxUnitName2").val(checkStatus.data[0].计量单位名称);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //BOM
            function get_btnBom() {
                layer.open({
@@ -1239,6 +1288,11 @@
                            , "HAuxQty": d.data[0].HAuxQty
                            , "HAuxUnit": d.data[0].HAuxUnit
                            , "HAuxUnitName": d.data[0].HAuxUnitName

                            , "HAuxQty2": d.data[0].HAuxQty2
                            , "HAuxUnit2": d.data[0].HAuxUnit2
                            , "HAuxUnitName2": d.data[0].HAuxUnitName2

                            , "HWidth": d.data[0].HWidth
                            , "HWeight": d.data[0].HWeight
                            , "HColorRemark": d.data[0].染色要求
@@ -1692,6 +1746,13 @@
            $("#HAuxUnit").val(obj[0].HItemID);
            $("#HAuxUnitName").val(obj[0].计量单位名称);
        }

        //辅助计量单位2
        function GetAuxiliaryUnit2Value(obj) {
            $("#HAuxUnit2").val(obj[0].HItemID);
            $("#HAuxUnitName2").val(obj[0].计量单位名称);
        }

        //工作中心
        function GetWorkCenterValue(obj) {
            $("#HCenterID").val(obj[0].HItemID);