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

zrg

2024-03-20 be198dac8ab0d25e835ce6cde690fdd484816931

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

@@ -361,7 +361,7 @@
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../../../views/Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                            content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes'],
                            btn: ['确定', '取消']
                            , btn1: function (index, layero) {
                                //按钮【按钮一】的回调
@@ -371,10 +371,10 @@
                                    return layer.msg('请选择数据');
                                }
                                obj.update({
                                    HMaterName: checkStatus.data[0].HName
                                    HMaterName: checkStatus.data[0].物料名称
                                    , HMaterID: checkStatus.data[0].HItemID
                                    , HMaterNumber: checkStatus.data[0].HNumber
                                    , HMaterModel: checkStatus.data[0].HModel
                                    , HMaterNumber: checkStatus.data[0].物料代码
                                    , HMaterModel: checkStatus.data[0].规格型号
                                });

                                layer.close(layer.index);
@@ -423,7 +423,7 @@
                , shade: 0.6 //遮罩透明度
                //, maxmin: true //允许全屏最小化
                , anim: 0 //0-6的动画形式，-1不开启
                , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {

@@ -433,7 +433,7 @@
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    $("#HDeptName").val(checkStatus.data[0].HName);
                    $("#HDeptName").val(checkStatus.data[0].部门名称);
                    $("#HDeptID").val(checkStatus.data[0].HItemID);
                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }