合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -300,7 +300,7 @@
                , laydate = layui.laydate
                , tree = layui.tree
                , carousel = layui.carousel
            var sWhere = " and 1=0";
            var sWhere = " and 1=1";
            var sql = "";
            var option = [];
            var Organization = sessionStorage["Organization"];
@@ -504,6 +504,26 @@
                table.render(option);
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '物料代码') {
                    var hID = data.HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑物料设置'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_Material.html?hID=' + hID + "&OperationType=3"
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });


            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -556,8 +576,7 @@
                //获取项目号
                Get_HProject();
                get_FastQuery()
                //过滤方案
                get_DefaultModule()
                
            }
            //#endregion

@@ -742,6 +761,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '物料代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
@@ -767,6 +793,8 @@
                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                //过滤方案
                                get_DefaultModule()
                            }
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                            //layer.alert("查询成功", { icon: 1 });
@@ -960,7 +988,7 @@
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && data[0].审核人==="") {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
@@ -993,7 +1021,7 @@
                    })
                }
                else {
                    layer.msg('请选择一行数据删除！');
                    layer.msg('请选择一行未审核数据删除！');
                }
            }
            //#endregion
@@ -1531,7 +1559,7 @@
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            //查询
                            get_FastQuery();
                            //get_FastQuery();
                            form.render("select");
                        }
                    }, error: function () {