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

zzr99

2022-08-09 555c1884899ce67775b9e9f1ea2def9c8e328d8d

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

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html

@@ -461,8 +461,8 @@
                    var InterID = data[0].HInterID.toString();
                    var HICMOInID = data[0].HSourceInterID.toString();
                    var HICMOEnID = data[0].HSourceEntryID.toString();
                    var HRelationInterID = data[0].HRelationInterID.toString();
                    if (HRelationInterID == 1) {
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus == 2) {
                        layer.msg('单据已报检审核无法删除！');
                        return false;
                    }
@@ -516,7 +516,6 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    console.log(JSON.stringify(data))
                    var HBillStatus = data[0].HBillStatus.toString(); //单据状态
                    var HSourceID = data[0].HSourceID.toString();  //生产资源ID
                    var HSourceInterID = data[0].HSourceInterID.toString(); //源单主内码
@@ -573,7 +572,7 @@
                    var HICMOInterID = data[0].HICMOInterID.toString();//生产订单主ID
                    var HICMOEntryID = data[0].HICMOEntryID.toString();//生产订单子ID
                    var HInterID = data[0].HInterID.toString();//产量汇报临时表主ID
                    if (HBillStatus = 1 || HBillStatus>2) {
                    if (HBillStatus == 1 || HBillStatus>2) {
                        layer.msg('单据未审核，不需要反审核或者单据已生效不允许反审核！');
                        return false;
                    }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/Sc_ICMOSortBillList.html

@@ -36,14 +36,14 @@
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="Organization" id="Organization" lay-verify="Organization">
                                        <select name="Organization" id="Organization" lay-verify="Organization">-->
                                            <!--动态渲染组织-->
                                        </select>
                                        <!--</select>
                                    </div>
                                </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
@@ -271,8 +271,8 @@
            $("#Organization").val("");//采购组织
            $("#HWorkShopIDName").val("");//生产车间
            $("#HWorkShopID").val("");//生产车间
            $("#HBTimes").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//日期
            $("#HETimes").val(Format(new Date(), "yyyy-MM-dd"));//至
            //$("#HBTimes").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//日期
            //$("#HETimes").val(Format(new Date(), "yyyy-MM-dd"));//至
            $("#HMaterName").val("");//物料名称
            $("#HMaterNumber").val("");//物料编码
            $("#HSeOrderBillNo").val("");//销售订单号

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -23,16 +23,15 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="hnumber" id="hnumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -53,7 +52,36 @@
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin: 10px 0 10px;">

                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -138,6 +166,12 @@
                get_FastQuery(2);
            });
            //#endregion

            //物料
            form.on('submit(btnHMaterID)', function (data) {//选择仓位

                get_btnHMaterID();
            });

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
@@ -249,7 +283,10 @@
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#WorkCenter").val("");//单据号
                $("#hnumber").val("");//物料
                $("#HMaterID").val(0);//物料
                $("#HMaterName").val("");//物料
                $("#HMaterNumber").val("");//物料
                $("#HModel").val("");//物料
                $("#HOrderProcNO").val("");//单据类型
                $("#btnSearch").click();
                $("#HName").val("");
@@ -258,6 +295,35 @@
                sWhere = "";
            }
            //#endregion


            //物料
            function get_btnHMaterID() {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '物料'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.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('请选择数据');
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HModel").val(checkStatus.data[0].HModel);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                })
            }

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
@@ -290,7 +356,10 @@
            function get_FastQuery(number) {
                var HOrgID = "";
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                var hnumber = $("#hnumber").val();
                var HMaterID = $("#HMaterID").val();
                var HMaterName = $("#HMaterName").val();
                var HMaterNumber = $("#HMaterNumber").val();
                var HModel = $("#HModel").val();
                //var HName = $("#HName").val();
                var WorkCenter = $("#WorkCenter").val();//单据号

@@ -304,8 +373,14 @@
                if (HOrderProcNO) {
                    sWhere += " and å•æ®ç±»åž‹ like '%" + HOrderProcNO + "%'";
                }
                if (hnumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + hnumber + "%' or ç‰©æ–™åç§° like '%" + hnumber + "%'";
                if (HMaterName) {
                    sWhere += "and HMaterID=" + HMaterID+"  and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
                }
                if (HMaterNumber) {
                    sWhere += "and  ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HModel) {
                    sWhere += "and  è§„格型号 like '%" + HModel + "%'";
                }
                if (WorkCenter) {
                    sWhere += " and å•æ®å· like '%" + WorkCenter + "%'";

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -197,6 +197,7 @@
                        , { field: '制单人', title: '制单人' }
                        , { field: '工序流转卡号', title: '工序流转卡号', width: 125 }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '流水号', title: '流水号' }
                        , { field: '当前工序代码', title: '当前工序代码', width: 125 }
                        , { field: '当前工序', title: '当前工序' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html

@@ -206,8 +206,16 @@
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1205'

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_FastList.html

@@ -395,6 +395,7 @@
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }

                        col.push({ type: 'radio' });
                        for (var i = 0; i < data.length; i++) {
                            if (data[i].name == '单据内码' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列