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

zzr99

2022-07-01 057adfe2031dc540381a465aff74e0d9e5d985fc

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

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -513,6 +513,10 @@
                    , title: '工序流转卡-编辑'
                    , shift: 0//弹出动画
                    , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
                    , end: function () {
                        //刷新页面,
                        location.reload();
                    }
                })
            } else {
                layer.msg('请选择一行数据下推！');

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -1031,7 +1031,7 @@
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    btn: ['确定', '取消']
                    ,btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调