wtt
2024-09-24 4998bc7bf98638a06a22d0613869130bececc8c3
采购订单操作类型初始化,应收应付折扣率初始修复
3个文件已修改
80 ■■■■ 已修改文件
WebTM/views/采购管理/应付单/Cg_PayableBill.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html
@@ -681,8 +681,8 @@
                                                , "HQty": dealDoubleToFixed(HQty, 1)
                                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , 'HDiscountRate': "0"                                                     //
                                                , 'HRelTaxPrice': "0"
                                                , 'HDiscountRate': "1"                                                     //
                                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , "HTaxRate": dataArray[i].税率
                                                , 'HTaxMoney': HTaxMoney                                                         //
                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -782,8 +782,8 @@
                                                , "HQty": dealDoubleToFixed(HQty, 1)
                                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , 'HDiscountRate': "0"                                                     //
                                                , 'HRelTaxPrice': "0"
                                                , 'HDiscountRate': "1"                                                     //
                                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                , "HTaxRate": dataArray[i].税率
                                                , 'HTaxMoney': HTaxMoney                                                         //
                                                , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -872,7 +872,7 @@
                    , "HQty": "0"
                    , "HPrice": "0"
                    , "HTaxPrice": "0"
                    , 'HDiscountRate': "0"
                    , 'HDiscountRate': "1"
                    , 'HRelTaxPrice': "0"
                    , "HTaxRate": "0"
                    , 'HTaxMoney': "0"
@@ -1409,7 +1409,7 @@
                    , "HQty": "0"
                    , "HPrice": "0"
                    , "HTaxPrice": "0"
                    , 'HDiscountRate': "0"
                    , 'HDiscountRate': "1"
                    , 'HRelTaxPrice': "0"
                    , "HTaxRate": "0"
                    , 'HTaxMoney': "0"
@@ -2920,8 +2920,8 @@
                            , "HQty": dealDoubleToFixed(HQty, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , 'HDiscountRate': "1"                                                     //
                            , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , "HTaxRate": dataArray[i].税率
                            , 'HTaxMoney': HTaxMoney                                                         //
                            , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -3054,8 +3054,8 @@
                            , "HQty": dealDoubleToFixed(HQty, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , 'HDiscountRate': "0"                                                     //
                            , 'HRelTaxPrice': "0"
                            , 'HDiscountRate': "1"                                                     //
                            , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                            , "HTaxRate": dataArray[i].税率
                            , 'HTaxMoney': HTaxMoney                                                         //
                            , "HMoney": dealDoubleToFixed(HMoney, 2)
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html
@@ -432,7 +432,10 @@
                })
            }
            //#endregion
            //判断页面打开方式
            if (OperationType == null || OperationType == "" || typeof (params[params[0]]) == "undefined") {
                OperationType = 1;//操作类型初始化
            }
            //判断是否新增
            if (linterid == null || linterid == 0) {    //判断 linterid å˜é‡æ˜¯å¦ä¸ºç©ºæˆ–者等于0
WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html
@@ -664,8 +664,8 @@
                                                    , "HQty": dealDoubleToFixed(HQty, 1)
                                                    , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                                    , 'HDiscountRate': "0"                                                     //
                                                    , 'HRelTaxPrice': "0"
                                                    , 'HDiscountRate': "1"                                                     //
                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                                    , "HTaxRate": dataArray[i].税率
                                                    , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
                                                    , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -716,8 +716,8 @@
                                                    , "HQty": dealDoubleToFixed(HQty, 1)
                                                    , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                                    , 'HDiscountRate': "0"                                                     //
                                                    , 'HRelTaxPrice': "0"
                                                    , 'HDiscountRate': "1"                                                     //
                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                                    , "HTaxRate": dataArray[i].税率
                                                    , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2)                                                         //
                                                    , "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -808,8 +808,8 @@
                                                    , "HQty": dealDoubleToFixed(HQty, 1)
                                                    , "HPrice": dealDoubleToFixed(dataArray[i].成本单价, 3)
                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                    , 'HDiscountRate': "0"                                                     //
                                                    , 'HRelTaxPrice': "0"
                                                    , 'HDiscountRate': "1"                                                     //
                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                    , "HTaxRate": dataArray[i].税率
                                                    , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].成本单价 * dataArray[0].税率, 2)                                                         //
                                                    , "HMoney": dealDoubleToFixed(HQty * dataArray[i].成本单价, 2)
@@ -853,8 +853,8 @@
                                                    , "HQty": dealDoubleToFixed(HQty, 1)
                                                    , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                                    , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                    , 'HDiscountRate': "0"                                                     //
                                                    , 'HRelTaxPrice': "0"
                                                    , 'HDiscountRate': "1"                                                     //
                                                    , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                                    , "HTaxRate": dataArray[i].税率
                                                    , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].单价 * dataArray[0].税率, 2)                                                         //
                                                    , "HMoney": dealDoubleToFixed(HQty * dataArray[i].单价, 2)
@@ -946,7 +946,7 @@
                    , "HQty": "0"
                    , "HPrice": "0"
                    , "HTaxPrice": "0"
                    , 'HDiscountRate': "0"
                    , 'HDiscountRate': "1"
                    , 'HRelTaxPrice': "0"
                    , "HTaxRate": "0"
                    , 'HTaxMoney': "0"
@@ -2008,8 +2008,8 @@
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , 'HDiscountRate': "0"                                                     //
                                , 'HRelTaxPrice': "0"
                                , 'HDiscountRate': "1"                                                     //
                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': "0"                                                         //
                                , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
@@ -2089,8 +2089,8 @@
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , 'HDiscountRate': "0"                                                     //
                                , 'HRelTaxPrice': "0"
                                , 'HDiscountRate': "1"                                                     //
                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': "0"                                                         //
                                , "HMoney": dealDoubleToFixed(dataArray[i].数量 * dataArray[i].单价, 2)
@@ -2315,13 +2315,14 @@
                        return false;
                    }
                    //价税合计格式校验
                    //税额格式校验
                    temp = option.data[i]["HTaxMoney"] + "";
                    if (temp == "0") {
                        layer.msg("第" + (i + 1) + "行:价税合计不能为0!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行:价税合计请输入大于0的数字!");
                    //if (temp == "0") {
                    //    layer.msg("第" + (i + 1) + "行:税额不能为0!");
                    //    return false;
                    //} else
                    if (!ref.test(temp)) {
                        layer.msg("第" + (i + 1) + "行:税额请输入不小于0的数字!");
                        return false;
                    }
@@ -2974,8 +2975,8 @@
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                , 'HDiscountRate': "0"                                                     //
                                , 'HRelTaxPrice': "0"
                                , 'HDiscountRate': "1"                                                     //
                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': "0"                                                         //
                                , "HMoney": dealDoubleToFixed(dataArray[i].数量 * dataArray[i].HNoTaxCost, 2)
@@ -3017,8 +3018,8 @@
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                , 'HDiscountRate': "0"                                                     //
                                , 'HRelTaxPrice': "0"
                                , 'HDiscountRate': "1"                                                     //
                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': "0"                                                         //
                                , "HMoney": dealDoubleToFixed(dataArray[i].金额, 2)
@@ -3142,8 +3143,8 @@
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].成本单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , 'HDiscountRate': "0"                                                     //
                                , 'HRelTaxPrice': "0"
                                , 'HDiscountRate': "1"                                                     //
                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': "0"                                                         //
                                , "HMoney": dealDoubleToFixed(dataArray[i].数量 * dataArray[i].成本单价, 2)
@@ -3186,8 +3187,8 @@
                                , "HQty": dealDoubleToFixed(dataArray[i].数量, 1)
                                , "HPrice": dealDoubleToFixed(dataArray[i].单价, 3)
                                , "HTaxPrice": dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , 'HDiscountRate': "0"                                                     //
                                , 'HRelTaxPrice': "0"
                                , 'HDiscountRate': "1"                                                     //
                                , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].含税单价, 3)
                                , "HTaxRate": dataArray[i].税率
                                , 'HTaxMoney': "0"                                                         //
                                , "HMoney": dealDoubleToFixed(dataArray[i].数量 * dataArray[i].单价, 2)