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

yusijie

2024-03-20 2f55e014a562ca2625e6ba3e3cc999c7d08c59c1

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill.html

@@ -593,7 +593,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/基础资料/Gy_BadReasonList.html', 'yes'],
                                content: ['../../基础资料/生产基础资料/Gy_BadReason.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -607,8 +607,8 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HBadReasonID: checkStatus.data[0].HItemID
                                        , HBadReasonNumber: checkStatus.data[0].HNumber
                                        , HBadReasonName: checkStatus.data[0].HName
                                        , HBadReasonNumber: checkStatus.data[0].不良原因代码
                                        , HBadReasonName: checkStatus.data[0].不良原因名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -631,7 +631,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                                content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -645,8 +645,8 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HEmpID: checkStatus.data[0].HItemID
                                        , HEmpNumber: checkStatus.data[0].HNumber
                                        , HEmpName: checkStatus.data[0].HName
                                        , HEmpNumber: checkStatus.data[0].职员代码
                                        , HEmpName: checkStatus.data[0].职员名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -707,7 +707,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                                content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -721,8 +721,8 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HCheckEmpID: checkStatus.data[0].HItemID
                                        , HCheckEmpNumber: checkStatus.data[0].HNumber
                                        , HCheckEmpName: checkStatus.data[0].HName
                                        , HCheckEmpNumber: checkStatus.data[0].职员代码
                                        , HCheckEmpName: checkStatus.data[0].职员名称
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -745,7 +745,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) {

@@ -759,9 +759,9 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID
                                        , HMaterNumber: checkStatus.data[0].HNumber
                                        , HMaterName: checkStatus.data[0].HName
                                        , HMaterModel: checkStatus.data[0].HModel
                                        , HMaterNumber: checkStatus.data[0].物料代码
                                        , HMaterName: checkStatus.data[0].物料名称
                                        , HMaterModel: checkStatus.data[0].规格型号
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
@@ -809,14 +809,31 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../../views/Baseset/基础资料/Gy_BadReasonList.html', 'yes']
                                , content: ['../../基础资料/生产基础资料/Gy_BadReason.html', 'yes']
                                , resize: false
                                , end: function () {
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }

                                    //更新表格缓存的数据
                                    _obj.update({
                                        HWasterReasonName: HReasonName
                                        , HBadReasonID: ReasonID
                                        HWasterReasonName: checkStatus.data[0].不良原因名称
                                        , HBadReasonID: checkStatus.data[0].HItemID
                                    });
                                    layer.close(index);//关闭弹窗
                                }
                                //, end: function () {
                                //    _obj.update({
                                //        HWasterReasonName: HReasonName
                                //        , HBadReasonID: ReasonID
                                //    });
                                //}
                            })
                            console.log("字段赋值" + data.HWasterReasonName);
                            console.log("行号：" + rowIndex);
@@ -835,13 +852,29 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                                , resize: false
                                , end: function () {
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }

                                    //更新表格缓存的数据
                                    _obj.update({
                                        HEmpName: EmpName
                                        HEmpName: checkStatus.data[0].职员名称
                                    });
                                    layer.close(index);//关闭弹窗
                                }
                                //, end: function () {
                                //    _obj.update({
                                //        HEmpName: EmpName
                                //    });
                                //}
                            })
                            console.log("字段赋值" + data.HEmpName);
                            console.log("行号：" + rowIndex);
@@ -860,14 +893,32 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../../views/Baseset/基础资料/Gy_ProcList.html', 'yes']
                                , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                                , resize: false
                                , end: function () {
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }

                                    //更新表格缓存的数据
                                    _obj.update({
                                        HSQProcName: SQProcName
                                        , HProcID: ProcID
                                       
                                        HSQProcName: checkStatus.data[0].工序名称
                                        , HProcID: checkStatus.data[0].HItemID
                                    });
                                    layer.close(index);//关闭弹窗
                                }
                                //, end: function () {
                                //    _obj.update({
                                //        HSQProcName: SQProcName
                                //        , HProcID: ProcID
                                //    });
                                //}
                            })
                            console.log("字段赋值" + data.HSQProcName);
                            console.log("行号：" + rowIndex);
@@ -886,13 +937,31 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../../views/Baseset/基础资料/Gy_ProcList.html?Type=HZR', 'yes']
                                , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                                , resize: false
                                , end: function () {
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }

                                    //更新表格缓存的数据
                                    _obj.update({
                                        HZRProcName: ZRProcName

                                        HZRProcName: checkStatus.data[0].工序名称
                                        
                                    });
                                    layer.close(index);//关闭弹窗
                                }
                                //, end: function () {
                                //    _obj.update({
                                //        HZRProcName: ZRProcName
                                //    });
                                //}
                            })
                            console.log("字段赋值" + data.HZRProcName);
                            console.log("行号：" + rowIndex);
@@ -927,13 +996,32 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                                , resize: false
                                , end: function () {
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }

                                    //更新表格缓存的数据
                                    _obj.update({
                                        HPSProcName: QRName

                                        HPSProcName: checkStatus.data[0].职员名称

                                    });
                                    layer.close(index);//关闭弹窗
                                }
                                //, end: function () {
                                //        _obj.update({
                                //            HPSProcName: QRName
                                //        });
                                //    }
                                //}
                            })
                            console.log("字段赋值" + data.HPSProcName);
                            console.log("行号：" + rowIndex);
@@ -1190,11 +1278,19 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_EmployeeList.html?Type=HKeeper', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.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('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].职员名称);
                        $("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });