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

yangle

2024-05-23 809996deb487815f964c91b3cb144d339d48c3b5

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_RepairList.html

@@ -88,6 +88,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>反审核</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -158,11 +160,13 @@
                    case 'btn-view':
                        get_ViewReport();
                        break;
                    //审核
                    case 'btn-Audit': set_AuditBill();
                    //审核按钮
                    case 'btn-Audit':
                        set_CheckBill(0);
                        break;
                    //反审核
                    case 'btn-DeAudit': set_DeAuditBill();
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_CheckBill(1);
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
@@ -383,7 +387,7 @@
                    title: '新增维修项目',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: ['../基础资料/Gy_RepairEdit.html?OperationType=1&linterid=&HSouceBillType='],
                    end: function () {
@@ -402,12 +406,12 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].HItemID.toString();
                    var hID = data[0].hitemid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑器具领用单'
                        , title: '编辑维修项目'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
@@ -458,7 +462,7 @@
                            $.ajax({
                                url: GetWEBURL() + '/Gy_Repair/DeleteRepair',
                                type: "GET",
                                data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"] },
                                data: { "HItemID": data[0].hitemid, "User": sessionStorage["HUserName"] },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -504,22 +508,17 @@
                }
            }

            //审核
            function set_AuditBill() {
            //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HBillStatus = data[0].HBillStatus.toString(); //单据状态
                    var HInterID = data[0].hmainid.toString();
                    if (HBillStatus > 0) {
                        layer.msg('单据不为未审核状态！');
                        return false;
                    }
                    var InterID = data[0].hitemid.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        url: GetWEBURL() + "/Gy_Repair/AuditGy_Repair", //方法所在页面和方法名
                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -543,47 +542,7 @@
                    layer.msg('请选择一行数据审核！');
                }
            }

            //反审核
            function set_DeAuditBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HBillStatus = data[0].HBillStatus.toString(); //单据状态
                    var HInterID = data[0].hmainid.toString();
                    if (HBillStatus = 0) {
                        layer.msg('单据已为未审核状态,无需反审核！');
                        return false;
                    }
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }

            }
            //#endregion

            //#region éšè—åˆ—设置
            function get_HideColumn() {