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

yangle

2023-10-18 25c920c6aa2ed727dbbaec1052c9651050ca74c0

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\乔一计量单位列表\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/grf/Éú²úÁìÁϵ¥16.grf

New file
@@ -0,0 +1,536 @@
{
    "Version":"6.8.2.2",
    "Font":{
        "Name":"宋体",
        "Size":105000,
        "Weight":400,
        "Charset":134
    },
    "Printer":{
        "Size":256,
        "Width":24,
        "Height":14,
        "LeftMargin":1,
        "TopMargin":0,
        "RightMargin":0,
        "BottomMargin":0
    },
    "DetailGrid":{
        "Recordset":{
            "Field":[
                {
                    "Name":"任务单号"
                },
                {
                    "Name":"工艺号",
                    "DBFieldName":"工序流转卡号"
                },
                {
                    "Name":"颜色",
                    "DBFieldName":"主产品名称"
                },
                {
                    "Name":"客户",
                    "DBFieldName":"客户名称"
                },
                {
                    "Name":"规格1",
                    "DBFieldName":"规格型号1"
                },
                {
                    "Name":"规格2",
                    "DBFieldName":"规格型号2"
                },
                {
                    "Name":"只数"
                },
                {
                    "Name":"布重",
                    "Type":"Float",
                    "Format":"#,##0.####",
                    "DBFieldName":"重量"
                },
                {
                    "Name":"打浆人",
                    "DBFieldName":"打浆人名称"
                },
                {
                    "Name":"制单人"
                },
                {
                    "Name":"编号",
                    "DBFieldName":"单据号"
                },
                {
                    "Name":"车间",
                    "DBFieldName":"部门"
                },
                {
                    "Name":"制单日期",
                    "Type":"DateTime",
                    "Format":"yyyyå¹´MM月dd日"
                },
                {
                    "Name":"染料助剂名称",
                    "DBFieldName":"物料名称"
                },
                {
                    "Name":"用量%",
                    "Type":"Float",
                    "Format":"#,##0.######",
                    "DBFieldName":"用量"
                },
                {
                    "Name":"重量",
                    "Type":"Float",
                    "Format":"#,##0.####",
                    "DBFieldName":"实收数量"
                },
                {
                    "Name":"单位",
                    "DBFieldName":"计量单位"
                },
                {
                    "Name":"备注",
                    "DBFieldName":"表体备注"
                },
                {
                    "Name":"机速",
                    "Type":"Float",
                    "Format":"#,##0.####"
                },
                {
                    "Name":"水冲",
                    "Type":"Float",
                    "Format":"#,##0.####"
                },
                {
                    "Name":"水量",
                    "Type":"Float",
                    "Format":"#,##0.####"
                },
                {
                    "Name":"水比",
                    "Type":"Float",
                    "Format":"#,##0.####"
                },
                {
                    "Name":"主产品代码"
                },
                {
                    "Name":"源单业务员名称"
                }
            ]
        },
        "Column":[
            {
                "Name":"序号",
                "Width":1.16417
            },
            {
                "Name":"染料助剂名称",
                "Width":4.81542
            },
            {
                "Name":"用量%",
                "Width":2.59292
            },
            {
                "Name":"重量",
                "Width":2.80458
            },
            {
                "Name":"单位",
                "Width":2.40771
            },
            {
                "Name":"备注",
                "Width":5.79438
            }
        ],
        "ColumnContent":{
            "Height":0.608542,
            "ColumnContentCell":[
                {
                    "Column":"序号",
                    "FreeCell":true,
                    "Control":[
                        {
                            "Type":"SystemVarBox",
                            "Name":"SystemVarBox1",
                            "Dock":"Fill",
                            "TextAlign":"MiddleCenter",
                            "SystemVar":"RowNo"
                        }
                    ]
                },
                {
                    "Column":"染料助剂名称",
                    "FreeCell":true,
                    "Control":[
                        {
                            "Type":"FieldBox",
                            "Name":"FieldBox6",
                            "Dock":"Fill",
                            "TextAlign":"MiddleCenter",
                            "DataField":"染料助剂名称"
                        }
                    ]
                },
                {
                    "Column":"用量%",
                    "FreeCell":true,
                    "Control":[
                        {
                            "Type":"FieldBox",
                            "Name":"FieldBox7",
                            "Dock":"Fill",
                            "TextAlign":"MiddleCenter",
                            "DataField":"用量%"
                        }
                    ]
                },
                {
                    "Column":"重量",
                    "TextAlign":"MiddleCenter",
                    "DataField":"重量"
                },
                {
                    "Column":"单位",
                    "TextAlign":"MiddleCenter",
                    "DataField":"单位"
                },
                {
                    "Column":"备注",
                    "DataField":"备注"
                }
            ]
        },
        "ColumnTitle":{
            "Height":0.608542,
            "ColumnTitleCell":[
                {
                    "GroupTitle":false,
                    "Column":"序号",
                    "TextAlign":"MiddleCenter",
                    "Text":"序号"
                },
                {
                    "GroupTitle":false,
                    "Column":"染料助剂名称",
                    "TextAlign":"MiddleCenter",
                    "Text":"染料助剂名称"
                },
                {
                    "GroupTitle":false,
                    "Column":"用量%",
                    "TextAlign":"MiddleCenter",
                    "Text":"用量‰"
                },
                {
                    "GroupTitle":false,
                    "Column":"重量",
                    "TextAlign":"MiddleCenter",
                    "Text":"重量"
                },
                {
                    "GroupTitle":false,
                    "Column":"单位",
                    "TextAlign":"MiddleCenter",
                    "Text":"单位"
                },
                {
                    "GroupTitle":false,
                    "Column":"备注",
                    "TextAlign":"MiddleCenter",
                    "Text":"备注"
                }
            ]
        }
    },
    "ReportHeader":[
        {
            "Name":"ReportHeader1",
            "Height":4.20688,
            "Control":[
                {
                    "Type":"FreeGrid",
                    "Name":"FreeGrid1",
                    "Top":2.46063,
                    "Border":{
                        "Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
                    },
                    "ColumnCount":8,
                    "RowCount":3,
                    "FreeGridColumn":[
                        {
                            "index":1,
                            "Width":2.03729
                        },
                        {
                            "index":2,
                            "Width":2.38125
                        },
                        {
                            "index":3,
                            "Width":1.71979
                        },
                        {
                            "index":4,
                            "Width":3.99521
                        },
                        {
                            "index":5,
                            "Width":1.48167
                        },
                        {
                            "index":6,
                            "Width":3.86292
                        },
                        {
                            "index":7,
                            "Width":1.34938
                        },
                        {
                            "index":8,
                            "Width":2.7781
                        }
                    ],
                    "FreeGridRow":[
                    ],
                    "FreeGridCell":[
                        {
                            "row":1,
                            "col":1,
                            "Text":"任务单号："
                        },
                        {
                            "row":1,
                            "col":2,
                            "Text":"[#任务单号#]"
                        },
                        {
                            "row":1,
                            "col":3,
                            "Text":"颜色："
                        },
                        {
                            "row":1,
                            "col":4,
                            "Text":"[#颜色#]"
                        },
                        {
                            "row":1,
                            "col":5,
                            "Text":"色号："
                        },
                        {
                            "row":1,
                            "col":6,
                            "Text":"[#主产品代码#]"
                        },
                        {
                            "row":1,
                            "col":7,
                            "Text":"水冲："
                        },
                        {
                            "row":1,
                            "col":8,
                            "Text":"[#水冲#]"
                        },
                        {
                            "row":2,
                            "col":1,
                            "Text":"客户："
                        },
                        {
                            "row":2,
                            "col":2,
                            "Text":"[#源单业务员名称#]"
                        },
                        {
                            "row":2,
                            "col":3,
                            "Text":"规格1："
                        },
                        {
                            "row":2,
                            "col":4,
                            "Text":"[#规格1#]"
                        },
                        {
                            "row":2,
                            "col":5,
                            "Text":"工艺号："
                        },
                        {
                            "row":2,
                            "col":6,
                            "Text":"[#工艺号#]"
                        },
                        {
                            "row":2,
                            "col":7,
                            "Text":"机速："
                        },
                        {
                            "row":2,
                            "col":8,
                            "Text":"[#机速#]"
                        },
                        {
                            "row":3,
                            "col":1,
                            "Text":"布重："
                        },
                        {
                            "row":3,
                            "col":2,
                            "Text":"[#布重#]"
                        },
                        {
                            "row":3,
                            "col":3,
                            "Text":"水比："
                        },
                        {
                            "row":3,
                            "col":4,
                            "Text":"[#水比#]"
                        },
                        {
                            "row":3,
                            "col":5,
                            "Text":"水量："
                        },
                        {
                            "row":3,
                            "col":6,
                            "Text":"[#水量#]"
                        },
                        {
                            "row":3,
                            "col":7,
                            "Text":"只数："
                        },
                        {
                            "row":3,
                            "col":8,
                            "Text":"[#只数#]"
                        }
                    ]
                },
                {
                    "Type":"StaticBox",
                    "Name":"StaticBox1",
                    "Left":17.0127,
                    "Top":1.40229,
                    "Width":1.21708,
                    "Height":0.79375,
                    "Text":"车间："
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox1",
                    "Left":18.2033,
                    "Top":1.40229,
                    "Width":2.01083,
                    "Height":0.79375,
                    "DataField":"车间"
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox2",
                    "Left":7.99042,
                    "Top":1.40229,
                    "Width":6.00604,
                    "Height":0.79375,
                    "TextAlign":"MiddleCenter",
                    "DataField":"制单日期"
                },
                {
                    "Type":"StaticBox",
                    "Name":"StaticBox2",
                    "Left":7.99042,
                    "Top":0.396875,
                    "Width":6.00604,
                    "Height":0.79375,
                    "Font":{
                        "Name":"宋体",
                        "Size":142500,
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"染色车间工艺配方单"
                },
                {
                    "Type":"Barcode",
                    "Name":"Barcode1",
                    "Left":4.10104,
                    "Top":0.396875,
                    "Width":2.19604,
                    "Height":1.5875,
                    "BarcodeType":"QRCode",
                    "CaptionPosition":"None",
                    "Text":"[#编号#]"
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox8",
                    "Left":3.70417,
                    "Top":2.01083,
                    "Width":2.98979,
                    "Height":0.396875,
                    "TextAlign":"MiddleCenter",
                    "DataField":"编号"
                }
            ]
        }
    ],
    "ReportFooter":[
        {
            "Name":"ReportFooter1",
            "Height":0.79375,
            "Control":[
                {
                    "Type":"StaticBox",
                    "Name":"StaticBox4",
                    "Left":1.00542,
                    "Top":0.211667,
                    "Width":1.61396,
                    "Height":0.608542,
                    "Text":"打浆人："
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox4",
                    "Left":2.59292,
                    "Top":0.211667,
                    "Width":2.61938,
                    "Height":0.608542,
                    "DataField":"打浆人"
                },
                {
                    "Type":"StaticBox",
                    "Name":"StaticBox5",
                    "Left":15.7956,
                    "Top":0.211667,
                    "Width":1.61396,
                    "Height":0.582083,
                    "Text":"制单人："
                },
                {
                    "Type":"FieldBox",
                    "Name":"FieldBox5",
                    "Left":17.4096,
                    "Top":0.211667,
                    "Width":2.61938,
                    "Height":0.582083,
                    "DataField":"制单人"
                }
            ]
        }
    ]
}

 WebTM/views/user/login2.html

@@ -401,7 +401,7 @@
                            if (!judgeMorPCflag) {//移动端
                                window.location.href = '../../views/index_Mobile.html'
                            } else {//PC端
                                window.location.href = '../../views/index.html'
                                window.location.href = '../../views/indexMenu.html'
                            }
                            get_WriteConfigFile();
                        }

 WebTM/views/ÏîÄ¿¹ÜÀí/Öܼƻ®/PM_WorkTaskWeekBillList.html

@@ -398,7 +398,7 @@
                            col.push({ field: "HTuesday", title: "周二", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HWednesday", title: "周三", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HThursday", title: "周四", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HFirday", title: "周五", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HFriday", title: "周五", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HSaturday", title: "周六", align: 'center', sort: true, width: 120 })
                            col.push({ field: "HSunday", title: "周日", align: 'center', sort: true, width: 120 })
                            //设置列
@@ -840,8 +840,9 @@
            //#region ä»»æ„å­—段过滤：列名显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                var noneArray = ["HMonday", "HTuesday", "HWednesday", "HThursday", "HFriday", "HSaturday", "HSunday"];              //设置不进行过滤的字段
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                    if (option.cols[0][i].hide != true && $.inArray(option.cols[0][i].field, noneArray) == -1) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html

@@ -116,6 +116,8 @@
                                <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-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchAudit"><i class="layui-icon layui-icon-radio"></i>批量审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchDeAudit"><i class="layui-icon layui-icon-radio"></i>批量反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
@@ -132,6 +134,13 @@
            </div>
        </div>
    </div>

    <!--批量审核/反审核进度条-->
    <div class="layui-progress layui-progress-big" lay-filter="BatchAuditProgress" id="BatchAuditProgress" style="width:20%;position:fixed;left:40%;top:55%;display:none;">
        <div class="layui-progress-bar" style="width:200px;" lay-percent="0%"></div>
    </div>


    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -190,6 +199,14 @@
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_CheckBill(2);
                        break;
                    //批量审核按钮
                    case 'btn-BatchAudit':
                        set_BatchCheckBill(1);
                        break;
                    //批量反审核按钮
                    case 'btn-BatchDeAudit':
                        set_BatchCheckBill(2);
                        break;
                    //关闭按钮        ï¼ˆ1:关闭、2:反关闭）
                    case 'btn-Close':
@@ -625,6 +642,74 @@
            }
            //#endregion

            //#region æ‰¹é‡åå®¡æ ¸/审核数据
            function set_BatchCheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (checkStatus.data.length != 0) {
                    var errMsg = "";                                         //记录审核失败信息
                    var successMsg = "";                                     //记录审核成功信息
                    var div = document.getElementById("BatchAuditProgress"); //获取进度条
                    var progressPercent = 0;
                    //获取需要审核的单据集合对应的单据内码集合
                    var HInterIDArray = [];
                    var HBillNoArray = [];
                    for (var i = 0; i < data.length; i++) {
                        if ($.inArray(data[i]["HInterID"], HInterIDArray) == -1) {
                            HInterIDArray.push(data[i]["HInterID"]);
                            HBillNoArray.push(data[i]["单据号"]);
                        }
                    }
                    //设置加载图标
                    var ajaxLoad = layer.load();
                    //进度条显示并进度归0
                    element.progress('BatchAuditProgress', '0%');
                    div.style.display = "block";
                    //遍历需要审核的单据内码集合，并审核对应单据内码的单据
                    for (var i = 0; i < HInterIDArray.length; i++) {
                        var HInterID = HInterIDArray[i];
                        var HBillNo = HBillNoArray[i];
                        //逻辑审核方法
                        $.ajax({
                            type: "GET",
                            async: false,
                            url: GetWEBURL() + "/PM_WorkTaskBill/AuditPM_WorkTaskBill", //方法所在页面和方法名
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    successMsg += "[" + HInterID + "],[" + HBillNo + "]：操作执行成功。\n";
                                } else {
                                    errMsg += "[" + HInterID + "],[" + HBillNo + "]：操作执行失败。失败原因：" + result.Message + "\n";
                                }
                            }, error: function () {
                                errMsg += "[" + HInterID + "],[" + HBillNo + "]：操作执行失败。失败原因：接口请求失败！\n";
                            }
                        });
                        //增加进度条进度
                        progressPercent = (i + 1) / HInterIDArray.length * 100;
                        element.progress('BatchAuditProgress', progressPercent + "%");
                    }

                    //隐藏进度条
                    div.style.display = "none";

                    //拼接审核成功信息与审核失败信息
                    var resultMessage = successMsg + errMsg;
                    //审核结果提示弹窗
                    layer.alert(resultMessage, { icon: 5 });

                    //关闭加载图标
                    layer.close(ajaxLoad);
                    //刷新界面
                    $("#btnSearch").trigger('click');
                }
                else {
                    layer.msg('请选择数据审核！');
                }
            }
            //#endregion

            //#region åå…³é—­/关闭数据
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskReportBillList.html

@@ -116,6 +116,8 @@
                                <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-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchAudit"><i class="layui-icon layui-icon-radio"></i>批量审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchDeAudit"><i class="layui-icon layui-icon-radio"></i>批量反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
@@ -131,6 +133,13 @@
            </div>
        </div>
    </div>

    <!--批量审核/反审核进度条-->
    <div class="layui-progress layui-progress-big" lay-filter="BatchAuditProgress" id="BatchAuditProgress" style="width:20%;position:fixed;left:40%;top:55%;display:none;">
        <div class="layui-progress-bar" style="width:200px;" lay-percent="0%"></div>
    </div>


    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -189,6 +198,14 @@
                    //反审核按钮
                    case 'btn-DeAudit':
                        set_CheckBill(2);
                        break;
                    //批量审核按钮
                    case 'btn-BatchAudit':
                        set_BatchCheckBill(1);
                        break;
                    //批量反审核按钮
                    case 'btn-BatchDeAudit':
                        set_BatchCheckBill(2);
                        break;
                    //关闭按钮        ï¼ˆ1:关闭、2:反关闭）
                    case 'btn-Close':
@@ -625,6 +642,74 @@
            }
            //#endregion

            //#region æ‰¹é‡åå®¡æ ¸/审核数据
            function set_BatchCheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (checkStatus.data.length != 0) {
                    var errMsg = "";                                         //记录审核失败信息
                    var successMsg = "";                                     //记录审核成功信息
                    var div = document.getElementById("BatchAuditProgress"); //获取进度条
                    var progressPercent = 0;
                    //获取需要审核的单据集合对应的单据内码集合
                    var HInterIDArray = [];
                    var HBillNoArray = [];
                    for (var i = 0; i < data.length; i++) {
                        if ($.inArray(data[i]["HInterID"], HInterIDArray) == -1) {
                            HInterIDArray.push(data[i]["HInterID"]);
                            HBillNoArray.push(data[i]["单据号"]);
                        }
                    }
                    //设置加载图标
                    var ajaxLoad = layer.load();
                    //进度条显示并进度归0
                    element.progress('BatchAuditProgress', '0%');
                    div.style.display = "block";
                    //遍历需要审核的单据内码集合，并审核对应单据内码的单据
                    for (var i = 0; i < HInterIDArray.length; i++) {
                        var HInterID = HInterIDArray[i];
                        var HBillNo = HBillNoArray[i];
                        //逻辑审核方法
                        $.ajax({
                            type: "GET",
                            async: false,
                            url: GetWEBURL() + "/PM_WorkTaskBill/AuditPM_WorkTaskBill", //方法所在页面和方法名
                            data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    successMsg += "[" + HInterID + "],[" + HBillNo + "]：操作执行成功。\n";
                                } else {
                                    errMsg += "[" + HInterID + "],[" + HBillNo + "]：操作执行失败。失败原因：" + result.Message + "\n";
                                }
                            }, error: function () {
                                errMsg += "[" + HInterID + "],[" + HBillNo + "]：操作执行失败。失败原因：接口请求失败！\n";
                            }
                        });
                        //增加进度条进度
                        progressPercent = (i + 1) / HInterIDArray.length * 100;
                        element.progress('BatchAuditProgress', progressPercent + "%");
                    }

                    //隐藏进度条
                    div.style.display = "none";

                    //拼接审核成功信息与审核失败信息
                    var resultMessage = successMsg + errMsg;
                    //审核结果提示弹窗
                    layer.alert(resultMessage, { icon: 5 });

                    //关闭加载图标
                    layer.close(ajaxLoad);
                    //刷新界面
                    $("#btnSearch").trigger('click');
                }
                else {
                    layer.msg('请选择数据审核！');
                }
            }
            //#endregion

            //#region åå…³é—­/关闭数据
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillLEdit.html

@@ -381,7 +381,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType":"", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HWeight": "0" };
                console.log(NewRow);
                switch (obj.event) {
                    //新增一行
@@ -1139,6 +1139,7 @@
                    , { field: 'HQtyMust', title: '应发数量', width: 100, hide: true}
                    , { field: 'HRate', title: '用量‰', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '重量', width: 100 }
                    , { field: 'HWeight', title: '实际称重', width: 100 }
                    , { field: 'HPrice', title: '单价', width: 100, hide: true}
                    , { field: 'HMoney', title: '金额', width: 100, hide: true}
                    , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
@@ -1198,7 +1199,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate":0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "", "HWeight": "0"}];
                table.render(option);
            }
            //#endregion
@@ -1209,6 +1210,10 @@
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HMaterRuleType": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体

                for (var i = 0; i < option.data.length; i++) {
                    option.data[i].HWeight = "0";
                }
                
                table.render(option);

@@ -1384,6 +1389,9 @@
                    var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                    table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    //设置复制得到的记录的实际称重为0
                    option.data[option.data.length - 1].HWeight = "0";

                    table.render(option);//将数据渲染到表格上
                }
            }