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

yangle

2024-01-22 a7b22f68527cfbd0e1400c06ef8a3e6b598f85c6

 WebTM/views/ÏúÊÛ¹ÜÀí/ÌØÅúÉêÇëµ¥/Xs_ExceptiveCheckRequestBillList.html

@@ -288,6 +288,7 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 50000]
@@ -305,6 +306,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var totalArray = ["本次发货金额", "应收款余额","本次发货数量"];
                            var data = [];
                            var col = [];
                            //给空的数组赋值
@@ -317,6 +319,9 @@
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                }
                                else {
                                    switch (data[i].Type) {
@@ -428,7 +433,7 @@
                    , title: '特批申请单-新增'
                    , shift: 0//弹出动画
                    , content: '../../销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html?OperationType=1&linterid=0&HSouceBillType='
                    ,btn: ['确定'],
                    ,btn: [],
                    end: function (index, layero, that) {
                        //刷新页面
                        $("#btnSearch").trigger('click');
@@ -450,7 +455,7 @@
                        , title: '特批申请单-编辑'
                        , shift: 0//弹出动画
                        , content: '../../销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , btn: ['确定'],
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
@@ -475,7 +480,7 @@
                        , title: '项目阶段列表-浏览'
                        , shift: 0//弹出动画
                        , content: '../../项目管理/项目阶段/Add_Edit_Gy_ProjectStage.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
                        , btn: ['确定'],
                        , btn: [],
                        // æŒ‰é’®1 çš„回调
                        btn1: function (index, layero, that) {
                            //刷新页面
@@ -537,7 +542,8 @@
                if (checkStatus.data.length === 1) {

                    if (data[0].状态 != "已审核") {
                        layer.alert("下推失败!原因：单据状态不为'已审核'状态!!", { icon: 5 });
                        var err = "下推失败!原因：当前单据状态为“" + data[0].状态 + "”,不允许下推！";
                        layer.alert(err, { icon: 5 });
                        return;
                    }