MES-WEB-LayUI.git

parent: 26abc9ee | 补丁 | 提交 | ignore whitespace

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

zrg

2024-11-06 10857dead6731bebcbf72b687d256834d2beb7ca

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

13个文件已修改

1个文件已添加

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资结算单(个人)/Pay_BatchCheck.html	162 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html	103 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesSumQueryBillList.html	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/付款单/YF_PayMentBill.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/应收单/Xs_ReceivableBill.html	80 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/销售出库/Kf_SellOutBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -421,6 +421,7 @@
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentMonthSumReport.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentTimeSumReport.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentPieceSumReport.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28ä¸ªäºº%29\Pay_BatchCheck.html" />
    <Content Include="views\å·¥èµç®¡ç\å·¥èµè¿ç®\Pay_SalaryCalculate_New.html" />
    <Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBillList.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -10,7 +10,7 @@
    var WEBURL = "http://localhost:8082/API/";    //å¼ çå¹¿æ¬å°éç½®
   /* var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®*/
    //var WEBURL = "http://47.96.97.237/API/";          //æºäºæå¡å¨
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //ä½ææ°æ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://localhost:8088/ARAPI/";      //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://localhost/API/";             //æ½æµæ¸¸æ¬å°éç½®
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //å¥¥é¦

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê½áËãµ¥(¸öÈË)/Pay_BatchCheck.html

New file
@@ -0,0 +1,162 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>å·¥èµç»ç®åï¼ä¸ªäººï¼åè¡¨</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--å¼ç¨layuiæ ·å¼æä»¶-->
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <!--å¼ç¨layui jsæä»¶-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">çäº§çç»</label>
                                    <div class="layui-input-block">
                                        <select name="HGroupID" id="HGroupID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
                                            <!--å¨ææ¸²æè½¦é´-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">å¹´</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HYear" id="HYear" lay-verify="HYear">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">æ</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
                                            <!--å¨ææ¸²æç»ç»-->
                                        </select>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , soulTable = layui.soulTable
            //#endregion

            set_ClearBill();

            // åå§åçé¢
            function set_ClearBill() {
                Year();
                Month();
                get_Group();
            }

            function get_Group() {
                //è·åè½¦é´å
                var HGroupID = '<option value="0" style="color:red;" selected>å¨é¨çç»</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Group/list",
                    async: false,
                    data: { "sWhere": "", "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HGroupID += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].çç»åç§° + '</option>';
                            }
                            $("#HGroupID").append(HGroupID);

                            if (sessionStorage["HGroupID"] != "0") {
                                $("#HGroupID").val(sessionStorage["HGroupID"]);
                                //ç¨æ·ç»å®çè½¦é´ä¸åå¨ï¼åé»è®¤æ¾ç¤ºå¨é¨è½¦é´
                                if ($("#HGroupID").val() == null || $("#HGroupID").val() == undefined) {
                                    $("#HGroupID").val(0);
                                }
                            }

                            //$("#HDeptName").val("0");

                            form.render('select');

                        }
                        else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                })
            }
            //å¹´
            function Year() {
                var yyyy = new Date().getFullYear();
                var YearOption = "";
                for (var i = 0; i <= 10; i++) {
                    YearOption += '<option  style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
                }
                $("#HYear").append(YearOption);
                $("#HYear").val(yyyy)
                form.render('select');
            }

            //æ
            function Month() {
                var MM = new Date().getMonth() + 1;
                var MonthOption = "";
                for (var i = 1; i <= 12; i++) {
                    MonthOption += '<option  style="color:blue;" value="' + i + '">' + i + '</option>';
                }
                $("#HPeriod").append(MonthOption);
                $("#HPeriod").val(MM)
                form.render('select');
            }

            
            //ä»¥ä¸æ¯layuiæ¨¡å
        });
        
    </script>

</body>
</html>

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê½áËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -591,18 +591,6 @@

            //#region å¯¼åºExecel
            function btn_Export() {
                var data = option.data
                data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                        }
                    }
                });

                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
@@ -764,40 +752,67 @@
            }
            //#endregion

            ////#region  æ¹éå®¡æ ¸ï¼num=1ï¼/åå®¡æ ¸ï¼num=2ï¼
            //function set_CheckBillAll(num) {
            //    var checkStatus = table.checkStatus('mainTable')
            //        , data = checkStatus.data;
            //    if (checkStatus.data.length != 0) {
            //        var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
            //        var queryString = uniqueIds.join(",");//å°idsåææ°ç»
            //        $.ajax({
            //            type: "GET",
            //            url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
            //            async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
            //            data: { "ids": queryString, "Type": num, "HMaker": HMaker },
            //            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.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
            //                }
            //            }, error: function () {
            //                layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
            //            }
            //        });
            //    }
            //    else {
            //        layer.msg('è¯·éæ©æ°æ®å®¡æ ¸ï¼');

            //    }
            //}
            ////#endregion

            //#region  æ¹éå®¡æ ¸ï¼num=1ï¼/åå®¡æ ¸ï¼num=2ï¼
            function set_CheckBillAll(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length != 0) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
                    var queryString = uniqueIds.join(",");//å°idsåææ°ç»
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
                        async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                        data: { "ids": queryString, "Type": num, "HMaker": HMaker },
                        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.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            }
                        }, error: function () {
                            layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        }
                    });
                }
                else {
                    layer.msg('è¯·éæ©æ°æ®å®¡æ ¸ï¼');

                }
                 //$.ajax({
                 //       type: "GET",
                 //       url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
                 //       async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                 //       data: { "ids": queryString, "Type": num, "HMaker": HMaker },
                 //       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.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                 //           }
                 //       }, error: function () {
                 //           layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                 //       }
                 //   });
            }
            //#endregion


 WebTM/views/¹¤×Ê¹ÜÀí/¿¼ÇÚ»ã±¨µ¥/Pay_WorkTimesSumQueryBillList.html

@@ -65,6 +65,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                            </div>
                        </script>
@@ -91,7 +92,7 @@
            var option = [];
            var sWhere = "";
            var HModName = "Pay_WorkTimesReportBill";

            var ins;
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["hmainid", "HDeptID", "HGroupID","HMangerID","HLeaveID","hsubid","HMaterID","HProcID","hEmpid"];
            //#endregion
@@ -115,6 +116,9 @@
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    //å¯¼åºæé®
                    case 'btn_Export': btn_Export();
                        break;
                };
            });
@@ -304,6 +308,24 @@
            }
            //#endregion

            //#region å¯¼åºExecel
            function btn_Export() {
                var data = option.data
                data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                        }
                    }
                });

                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //#region å·æ°
            function get_Refresh() {
                set_ClearQuery();
@@ -419,8 +441,10 @@
                                }
                            }
                            table.render(option);
                            ins = table.render(option);
                        } else {
                            table.render(option);
                            ins = table.render(option);
                        }
                    }, error: function () {
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/MaterialShorAnalysisReport.html

@@ -282,10 +282,10 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , page: false
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limit: 20000
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [columns]

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportMOMaterReadysBillList.html

@@ -263,10 +263,10 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , page: false
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limit: 20000
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , done: function (res, curr, count) {

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportPODemandPlanBillList.html

@@ -336,10 +336,10 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , page: false
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limit: 20000
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [columns]

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportPODemandPlanBillList_S.html

@@ -314,9 +314,9 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , page: false
                , cellMinWidth: 90
                , limit: 50
                , limit: 20000
                , limits: [50, 500, 5000, 20000]
                , totalRow: true
                , loading: false

 WebTM/views/Éú²ú¹ÜÀí/ÈÕ¼Æ»®±¨±í/ReportWorkDemandPlanBillList.html

@@ -296,9 +296,9 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , page: false
                , cellMinWidth: 90
                , limit: 50
                , limit: 20000
                , totalRow: true
                , limits: [50, 500, 5000, 20000]
                , loading: false

 WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html

@@ -1070,7 +1070,7 @@
                            , "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
                            , "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)                                                   //
                            , "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
                            , "HInvoiceBillNo_Sub": dataArray[i].åç¥¨ç¼å·
                            , "HInvoiceBillNo_Sub": dataArray[i].åç¥¨ç¼å· ? "" : dataArray[i].åç¥¨ç¼å·
                            , "HReceiveBillInterID": dataArray[i].hmainid
                            , "HReceiveBillEntryID": dataArray[i].hsubid
                            , "HReceiveBillNo": dataArray[i].åæ®å·
@@ -1355,7 +1355,7 @@
                                , "HRelSumMoney": data.ææ£åéé¢
                                , "HAccDate": formatDate(data.è´¢å¡æ¥æ)
                                , "HCreditRating_Now": data.HCreditRating_Now
                                , "HInvoiceBillNo": data.åç¥¨ç¼å·
                                , "HInvoiceBillNo": data.åç¥¨ç¼å· ? "" : data.åç¥¨ç¼å·
                                , "HBigMoney": data.å¤§åéé¢
                                , "HReason": data.ä»æ¬¾äºç±
                                , "HMaker": data.å¶åäºº
@@ -1387,7 +1387,7 @@
                                            , "HQty": dealDoubleToFixed(result.data[i].æ°é, 1)
                                            , "HPrice": dealDoubleToFixed(result.data[i].åä»·, 3)                                                   //
                                            , "HMoney": dealDoubleToFixed(result.data[i].ç»ç®éé¢, 2)
                                            , "HInvoiceBillNo_Sub": result.data[i].åç¥¨å·ç 
                                            , "HInvoiceBillNo_Sub": result.data[i].åç¥¨å·ç  ? "" : result.data[i].åç¥¨å·ç 
                                            , "HReceiveBillInterID": result.data[i].æºåä¸»åç 
                                            , "HReceiveBillEntryID": result.data[i].æºåååç 
                                            , "HReceiveBillNo": result.data[i].æºååå·

 WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html

@@ -136,8 +136,9 @@
                                            <label class="layui-form-label">åä»·ç±»å</label>
                                            <div class="layui-input-inline">
                                                <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
                                                    <option value="ææ¬ä»·" selected="selected">ææ¬ä»·</option>
                                                    <option value="å»ç¨ä»·" selected="selected">å»ç¨ä»·</option>
                                                    <option value="ç»ç®ä»·">ç»ç®ä»·</option>
                                                    <option value="å«ç¨ä»·">å«ç¨ä»·</option>
                                                </select>
                                            </div>
                                        </div>
@@ -1286,6 +1287,69 @@
                }
            });
            //#endregion

            //#region ä¸ææ¡äºä»¶
            // çå¬ä¸ææ¡éæ©  
            form.on('select(HPriceType)', function (data) {
                console.log(data.value); // å¾å°è¢«éä¸çå¼  
                // æ§è¡ç¸å³æä½  
                //#region åè¡¨ æ°æ®æ£éª
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HMaterID"] == "0") {
                        layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç©ææªéæ©ï¼");
                        return false;
                    } else {
                        var HPrice = option.data[i]["HPrice"];
                        var HMaterID = option.data[i]["HMaterID"];
                        var HType = data.value.toString();
                        //è·åç©æå¯¹åºåä»·ç±»åçåä»·
                        $.ajax({
                            url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
                            type: "GET",
                            async: false,
                            data: { "HMaterID": HMaterID, HType: HType },
                            success: function (d) {
                                HPrice = Number(d.data);
                            }, error: function () {
                                layer.alert("åçéè¯¯!" + d.Message, { icon: 5 });
                            }
                        });
                        var Dec = getDecByMaterID(option.data[i]["HMaterID"]) //è·åç²¾åº¦
                        var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //æ°éç²¾åº¦
                        var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //åä»·ç²¾åº¦
                        var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //éé¢ç²¾åº¦
                        //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
                        var HTaxRate = option.data[i]["HTaxRate"] * 0.01;
                        var HExRate = $("#HExRate").val();                      //æ±ç
                        var HQty = option.data[i]["HQty"] * 1;                           //æ°é
                        var HMoney = HQty * HPrice;                     //éé¢=æ°é*åä»·
                        var HTaxMoney = Number((HMoney * HTaxRate));         //ç¨é¢=éé¢*ç¨ç
                        var HlineTotal = HMoney + HTaxMoney;            //ä»·ç¨åè®¡=éé¢+ç¨é¢
                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //å«ç¨åä»·=åä»·*(1+ç¨ç)
                        var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate));     //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
                        var HDiscountRate = option.data[i]["HDiscountRate"] * 1;   //ææ£ç
                        var HRelTaxPrice = Number((HTaxPrice * HDiscountRate));   //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
                        var HExRate = $("#HExRate").val();                      //æ±ç
                        var HMoneyBB = HMoney * HExRate;
                        ///æ°åç²¾åº¦
                        option.data[i]["HQty"] = Number(HQty.toFixed(HQtyDec));
                        option.data[i]["HPrice"] = Number(HPrice.toFixed(HPriceDec));
                        option.data[i]["HMoney"] = Number(HMoney.toFixed(HMoneyDec));
                        option.data[i]["HTaxMoney"] = Number(HTaxMoney.toFixed(HMoneyDec));
                        option.data[i]["HMoneyBB"] = Number(HMoneyBB.toFixed(HMoneyDec));
                        option.data[i]["HlineTotal"] = Number(HlineTotal.toFixed(HMoneyDec));
                        option.data[i]["HTaxPrice"] = Number(HTaxPrice.toFixed(HPriceDec));
                        option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
                        option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
                    }
                    
                }
                table.render(option);
                //#endregion
            });

            //#endregion

            //#endregion

            //#endregion
@@ -2372,12 +2436,7 @@
                                        var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //æ°éç²¾åº¦
                                        var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //åä»·ç²¾åº¦
                                        var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //éé¢ç²¾åº¦
                                        var HPrice = 0;
                                        if ($("#HPriceType").val() == "ææ¬ä»·") {
                                            HPrice = OptionData.å«ç¨ææ¬ä»· * 1;//åä»·
                                        } else {
                                            HPrice = OptionData.ç»ç®ä»· * 1;//åä»·
                                        }
                                        var HPrice = obj.data.HPrice * 1;
                                        var HTaxRate = obj.data.HTaxRate*0.01;
                                        if (HSupID != 0) {
                                            $.ajax({
@@ -2511,12 +2570,7 @@
                                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //æ°éç²¾åº¦
                                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //åä»·ç²¾åº¦
                                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //éé¢ç²¾åº¦
                                var HPrice = 0;
                                if ($("#HPriceType").val() == "ææ¬ä»·") {
                                    HPrice = OptionData.å«ç¨ææ¬ä»· * 1;//åä»·
                                } else {
                                    HPrice = OptionData.ç»ç®ä»· * 1;//åä»·
                                }
                                var HPrice = obj.data.HPrice * 1;
                                var HTaxRate = obj.data.HTaxRate*0.01;
                                if (HSupID != 0) {
                                    $.ajax({

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -1555,7 +1555,7 @@
                                        "ä»åº": result.data[i]["åä»åº"],
                                        "HQty": dealDoubleToFixed(result.data[i]["æ°é"], 1),
                                        "HPrice": dealDoubleToFixed(result.data[i]["åä»·"], 3),
                                        "HTaxPrice": dealDoubleToFixed(result.data[i]["å«ç¨åä»·"], 3),
                                        "HTaxPrice": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
                                        "HMoney": dealDoubleToFixed(result.data[i]["éé¢"],2),
                                        "HDiscountRate": result.data[i]["ææ£ç"],
                                        "HRelTaxPrice": result.data[i]["å®éå«ç¨åä»·"],

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -66,7 +66,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®ç¼å·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                            </div>
                                        </div>

			@@ -421,6 +421,7 @@
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentMonthSumReport.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentTimeSumReport.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµæ¥è¡¨\Pay_PaymentPieceSumReport.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµç»ç®å%28ä¸ªäºº%29\Pay_BatchCheck.html" />
			<Content Include="views\å·¥èµç®¡ç\å·¥èµè¿ç®\Pay_SalaryCalculate_New.html" />
			<Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBill.html" />
			<Content Include="views\å·¥èµç®¡ç\æè½èæ ¸\HR_EmployeeSkillExamBillList.html" />

			@@ -10,7 +10,7 @@
			var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			/* var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®*/
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			/var WEBURL = "http://localhost:8082/LuBaoAPI/"; / //ä½ææ°æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://localhost/API/"; //æ½æµæ¸¸æ¬å°éç½®
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //å¥¥é¦

New file
			@@ -0,0 +1,162 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>å·¥èµç»ç®åï¼ä¸ªäººï¼åè¡¨</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<!--å¼ç¨layuiæ ·å¼æä»¶-->
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<!--å¼ç¨layui jsæä»¶-->
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>

			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-inline">
			<label class="layui-form-label">çäº§çç»</label>
			<div class="layui-input-block">
			<select name="HGroupID" id="HGroupID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¹´</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 85px;">
			<select name="HYear" id="HYear" lay-verify="HYear">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 85px;">
			<select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			</div>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			//#endregion

			set_ClearBill();

			// åå§åçé¢
			function set_ClearBill() {
			Year();
			Month();
			get_Group();
			}

			function get_Group() {
			//è·åè½¦é´å
			var HGroupID = '<option value="0" style="color:red;" selected>å¨é¨çç»</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Group/list",
			async: false,
			data: { "sWhere": "", "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HGroupID += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].çç»åç§° + '</option>';
			}
			$("#HGroupID").append(HGroupID);

			if (sessionStorage["HGroupID"] != "0") {
			$("#HGroupID").val(sessionStorage["HGroupID"]);
			//ç¨æ·ç»å®çè½¦é´ä¸åå¨ï¼åé»è®¤æ¾ç¤ºå¨é¨è½¦é´
			if ($("#HGroupID").val() == null \|\| $("#HGroupID").val() == undefined) {
			$("#HGroupID").val(0);
			}
			}

			//$("#HDeptName").val("0");

			form.render('select');

			}
			else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//å¹´
			function Year() {
			var yyyy = new Date().getFullYear();
			var YearOption = "";
			for (var i = 0; i <= 10; i++) {
			YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
			}
			$("#HYear").append(YearOption);
			$("#HYear").val(yyyy)
			form.render('select');
			}

			//æ
			function Month() {
			var MM = new Date().getMonth() + 1;
			var MonthOption = "";
			for (var i = 1; i <= 12; i++) {
			MonthOption += '<option style="color:blue;" value="' + i + '">' + i + '</option>';
			}
			$("#HPeriod").append(MonthOption);
			$("#HPeriod").val(MM)
			form.render('select');
			}


			//ä»¥ä¸æ¯layuiæ¨¡å
			});

			</script>

			</body>
			</html>

			@@ -591,18 +591,6 @@

			//#region å¯¼åºExecel
			function btn_Export() {
			var data = option.data
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion
			@@ -764,40 +752,67 @@
			}
			//#endregion

			////#region æ¹éå®¡æ ¸ï¼num=1ï¼/åå®¡æ ¸ï¼num=2ï¼
			//function set_CheckBillAll(num) {
			// var checkStatus = table.checkStatus('mainTable')
			// , data = checkStatus.data;
			// if (checkStatus.data.length != 0) {
			// var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
			// var queryString = uniqueIds.join(",");//å°idsåææ°ç»
			// $.ajax({
			// type: "GET",
			// url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
			// async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			// data: { "ids": queryString, "Type": num, "HMaker": HMaker },
			// 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.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// }, error: function () {
			// layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// });
			// }
			// else {
			// layer.msg('è¯·éæ©æ°æ®å®¡æ ¸ï¼');

			// }
			//}
			////#endregion

			//#region æ¹éå®¡æ ¸ï¼num=1ï¼/åå®¡æ ¸ï¼num=2ï¼
			function set_CheckBillAll(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length != 0) {
			var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
			var queryString = uniqueIds.join(",");//å°idsåææ°ç»
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "ids": queryString, "Type": num, "HMaker": HMaker },
			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.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			}, error: function () {
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©æ°æ®å®¡æ ¸ï¼');

			}
			//$.ajax({
			// type: "GET",
			// url: GetWEBURL() + "/Pay_GroupBalBillController/CheckAll",
			// async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			// data: { "ids": queryString, "Type": num, "HMaker": HMaker },
			// 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.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// }, error: function () {
			// layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// });
			}
			//#endregion

			@@ -65,6 +65,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -91,7 +92,7 @@
			var option = [];
			var sWhere = "";
			var HModName = "Pay_WorkTimesReportBill";

			var ins;
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "HDeptID", "HGroupID","HMangerID","HLeaveID","hsubid","HMaterID","HProcID","hEmpid"];
			//#endregion
			@@ -115,6 +116,9 @@
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			};
			});
			@@ -304,6 +308,24 @@
			}
			//#endregion

			//#region å¯¼åºExecel
			function btn_Export() {
			var data = option.data
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			@@ -419,8 +441,10 @@
			}
			}
			table.render(option);
			ins = table.render(option);
			} else {
			table.render(option);
			ins = table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });

			@@ -282,10 +282,10 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limit: 20000
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, cols: [columns]

			@@ -263,10 +263,10 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limit: 20000
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, done: function (res, curr, count) {

			@@ -336,10 +336,10 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limit: 20000
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, cols: [columns]

			@@ -314,9 +314,9 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, cellMinWidth: 90
			, limit: 50
			, limit: 20000
			, limits: [50, 500, 5000, 20000]
			, totalRow: true
			, loading: false

			@@ -296,9 +296,9 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, cellMinWidth: 90
			, limit: 50
			, limit: 20000
			, totalRow: true
			, limits: [50, 500, 5000, 20000]
			, loading: false

			@@ -1070,7 +1070,7 @@
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3) //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, "HInvoiceBillNo_Sub": dataArray[i].åç¥¨ç¼å·
			, "HInvoiceBillNo_Sub": dataArray[i].åç¥¨ç¼å· ? "" : dataArray[i].åç¥¨ç¼å·
			, "HReceiveBillInterID": dataArray[i].hmainid
			, "HReceiveBillEntryID": dataArray[i].hsubid
			, "HReceiveBillNo": dataArray[i].åæ®å·
			@@ -1355,7 +1355,7 @@
			, "HRelSumMoney": data.ææ£åéé¢
			, "HAccDate": formatDate(data.è´¢å¡æ¥æ)
			, "HCreditRating_Now": data.HCreditRating_Now
			, "HInvoiceBillNo": data.åç¥¨ç¼å·
			, "HInvoiceBillNo": data.åç¥¨ç¼å· ? "" : data.åç¥¨ç¼å·
			, "HBigMoney": data.å¤§åéé¢
			, "HReason": data.ä»æ¬¾äºç±
			, "HMaker": data.å¶åäºº
			@@ -1387,7 +1387,7 @@
			, "HQty": dealDoubleToFixed(result.data[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(result.data[i].åä»·, 3) //
			, "HMoney": dealDoubleToFixed(result.data[i].ç»ç®éé¢, 2)
			, "HInvoiceBillNo_Sub": result.data[i].åç¥¨å·ç
			, "HInvoiceBillNo_Sub": result.data[i].åç¥¨å·ç ? "" : result.data[i].åç¥¨å·ç
			, "HReceiveBillInterID": result.data[i].æºåä¸»åç
			, "HReceiveBillEntryID": result.data[i].æºåååç
			, "HReceiveBillNo": result.data[i].æºååå·

			@@ -136,8 +136,9 @@
			<label class="layui-form-label">åä»·ç±»å</label>
			<div class="layui-input-inline">
			<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
			<option value="ææ¬ä»·" selected="selected">ææ¬ä»·</option>
			<option value="å»ç¨ä»·" selected="selected">å»ç¨ä»·</option>
			<option value="ç»ç®ä»·">ç»ç®ä»·</option>
			<option value="å«ç¨ä»·">å«ç¨ä»·</option>
			</select>
			</div>
			</div>
			@@ -1286,6 +1287,69 @@
			}
			});
			//#endregion

			//#region ä¸ææ¡äºä»¶
			// çå¬ä¸ææ¡éæ©
			form.on('select(HPriceType)', function (data) {
			console.log(data.value); // å¾å°è¢«éä¸çå¼
			// æ§è¡ç¸å³æä½
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HMaterID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç©ææªéæ©ï¼");
			return false;
			} else {
			var HPrice = option.data[i]["HPrice"];
			var HMaterID = option.data[i]["HMaterID"];
			var HType = data.value.toString();
			//è·åç©æå¯¹åºåä»·ç±»åçåä»·
			$.ajax({
			url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
			type: "GET",
			async: false,
			data: { "HMaterID": HMaterID, HType: HType },
			success: function (d) {
			HPrice = Number(d.data);
			}, error: function () {
			layer.alert("åçéè¯¯!" + d.Message, { icon: 5 });
			}
			});
			var Dec = getDecByMaterID(option.data[i]["HMaterID"]) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HTaxRate = option.data[i]["HTaxRate"] * 0.01;
			var HExRate = $("#HExRate").val(); //æ±ç
			var HQty = option.data[i]["HQty"] * 1; //æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HDiscountRate = option.data[i]["HDiscountRate"] * 1; //ææ£ç
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HMoneyBB = HMoney * HExRate;
			///æ°åç²¾åº¦
			option.data[i]["HQty"] = Number(HQty.toFixed(HQtyDec));
			option.data[i]["HPrice"] = Number(HPrice.toFixed(HPriceDec));
			option.data[i]["HMoney"] = Number(HMoney.toFixed(HMoneyDec));
			option.data[i]["HTaxMoney"] = Number(HTaxMoney.toFixed(HMoneyDec));
			option.data[i]["HMoneyBB"] = Number(HMoneyBB.toFixed(HMoneyDec));
			option.data[i]["HlineTotal"] = Number(HlineTotal.toFixed(HMoneyDec));
			option.data[i]["HTaxPrice"] = Number(HTaxPrice.toFixed(HPriceDec));
			option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
			option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
			}

			}
			table.render(option);
			//#endregion
			});

			//#endregion

			//#endregion

			//#endregion
			@@ -2372,12 +2436,7 @@
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			var HPrice = 0;
			if ($("#HPriceType").val() == "ææ¬ä»·") {
			HPrice = OptionData.å«ç¨ææ¬ä»· * 1;//åä»·
			} else {
			HPrice = OptionData.ç»ç®ä»· * 1;//åä»·
			}
			var HPrice = obj.data.HPrice * 1;
			var HTaxRate = obj.data.HTaxRate*0.01;
			if (HSupID != 0) {
			$.ajax({
			@@ -2511,12 +2570,7 @@
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			var HPrice = 0;
			if ($("#HPriceType").val() == "ææ¬ä»·") {
			HPrice = OptionData.å«ç¨ææ¬ä»· * 1;//åä»·
			} else {
			HPrice = OptionData.ç»ç®ä»· * 1;//åä»·
			}
			var HPrice = obj.data.HPrice * 1;
			var HTaxRate = obj.data.HTaxRate*0.01;
			if (HSupID != 0) {
			$.ajax({

			@@ -1555,7 +1555,7 @@
			"ä»åº": result.data[i]["åä»åº"],
			"HQty": dealDoubleToFixed(result.data[i]["æ°é"], 1),
			"HPrice": dealDoubleToFixed(result.data[i]["åä»·"], 3),
			"HTaxPrice": dealDoubleToFixed(result.data[i]["å«ç¨åä»·"], 3),
			"HTaxPrice": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
			"HMoney": dealDoubleToFixed(result.data[i]["éé¢"],2),
			"HDiscountRate": result.data[i]["ææ£ç"],
			"HRelTaxPrice": result.data[i]["å®éå«ç¨åä»·"],

			@@ -66,7 +66,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			</div>
			</div>