../../销售管理/收款单/YS_ReceiveBill.html：增加 结算方式返回方法

duhe

2023-11-17 6e54db0de1b41ca840e42e11b39a300dba7ceaba

 WebTM/views/¹¤×ʹÜÀí/¼Ó°àÉêÇë/Pay_OverApplyBill.html

@@ -302,10 +302,6 @@
            }
            //#endregion

            //#region åˆå§‹åŒ–表格
            //DisPlay_HideColumn();
            //#endregion

            //#region åˆ¤æ–­å¹¶è®¾ç½®æ“ä½œç±»åž‹ã€é¡µé¢åˆå§‹åŒ–
            if (OperationType == null || OperationType == 1) {                            //新增
                OperationType = 1;
@@ -346,7 +342,7 @@
            //#endregion

            //#region åˆå§‹åŒ–表格
            //DisPlay_HideColumn();
            DisPlay_HideColumn();
            //#endregion

            //#endregion
@@ -503,7 +499,7 @@
                            var HTimes = (hours * 1 + minutes / 60).toFixed(2);                         //加班时间
                            //设置行数据
                            data["HTimes"] = HTimes;
                            if (data["HRelTimes"] == true) {
                            if (data["HRestFlag"] == true) {
                                data["HRelTimes"] = HTimes - data["HRestTimes"];
                            } else {
                                data["HRelTimes"] = HTimes;
@@ -539,7 +535,7 @@
                            var HRelPay = (HTimes * HPayMoney).toFixed(2);                              //应付工资 = å®žé™…实际*小时工资
                            //设置行数据
                            data["HTimes"] = HTimes;
                            if (data["HRelTimes"] == true) {
                            if (data["HRestFlag"] == true) {
                                data["HRelTimes"] = HTimes - data["HRestTimes"];
                            } else {
                                data["HRelTimes"] = HTimes;
@@ -667,16 +663,16 @@
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号' }
                        , { field: 'RowID', title: '行号' }                                                   //行标识，用于下一行、上一行识别所在行
                        , { field: 'HEmpID', title: '职员ID' }
                        , { field: 'RowID', title: '行号', hide: true }                                                   //行标识，用于下一行、上一行识别所在行
                        , { field: 'HEmpID', title: '职员ID', hide:true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HEmpNumber', title: '职员代码', edit: 'text', event: "HEmpNumber" }     //f7
                        , { field: 'HEmpName', title: '职员名称', style: 'background-color: #CDCDCD;' }
                        , { field: 'HEmpName', title: '职员名称', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBTimes', title: '开始时间', event: "HBTimes" }
                        , { field: 'HETimes', title: '结束时间', event: "HETimes" }
                        , { field: 'HRestFlag', title: '午休标记', templet: "#HRestFlag" }
                        , { field: 'HRestTimes', title: '午休时间', edit: 'text'}     //f7
                        , { field: 'HTimes', title: '加班时间', style: 'background-color: #CDCDCD;'}     //f7
                        , { field: 'HRelTimes', title: '实际时间', style: 'background-color: #CDCDCD;' }     //f7
                        , { field: 'HTimes', title: '加班时间', style: 'background-color: #f9f9f9;'}     //f7
                        , { field: 'HRelTimes', title: '实际时间', style: 'background-color: #f9f9f9;' }     //f7
                        , { field: 'HRemark', title: '备注', edit: 'text' }     //f7
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]]
@@ -899,6 +895,8 @@
                            option.data = tableSub;
                            for (var i = 0; i < option.data.length; i++) {
                                option.data[i]["RowID"] = (i + 1) * 10;
                                option.data[i]["HBTimes"] = option.data[i]["HBTimes"].split("T")[0] + " " + option.data[i]["HBTimes"].split("T")[1];
                                option.data[i]["HETimes"] = option.data[i]["HETimes"].split("T")[0] + " " + option.data[i]["HETimes"].split("T")[1];
                            }
                            table.render(option);
                            CheckedSet_tableSub();
@@ -1192,9 +1190,9 @@
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                    option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                    option.cols[0][i + 1]["style"] += "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {