生产订单列表下没有合计 销售出库单的件数没有合计 条码主档维护里的日期和对应的销售出库日期变成了hh:33:57，没显示小时 条码主档维护里，第2个筛...

duhe

2024-09-05 f1afe7afcff245354fe1e91709c4ea0b6590935f

生产订单列表下没有合计
销售出库单的件数没有合计
条码主档维护里的日期和对应的销售出库日期变成了hh:33:57，没显示小时
条码主档维护里，第2个筛选过滤框查询完之后过滤条件就消失了，第3个过滤条件报错，“7”附近有语法错误
销售出库单里的条码明细里的基本信息标签，含税单价改成单价（只要变字就可以了）
销售出库单里的条码明细里的基本信息标签，价税合计要有一个总计放在下面

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html

@@ -412,16 +412,16 @@
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            com = "like '%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            com = "like '%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            com = "like '" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            com = "not like '%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
@@ -429,20 +429,21 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                var com1 = "";
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            com1 = "like '%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            com1 = "like '%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            com1 = "like '" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            com1 = "not like '%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
@@ -450,20 +451,21 @@
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }

                var com2 = "";
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            com2 = "like '%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            com2 = "like '%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            com2 = "like '" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            com2 = "not like '%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
@@ -625,7 +627,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd hh:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -638,7 +640,7 @@
                            ins = table.render(option);
                            layer.close(index);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }
                            //刷新按钮显示

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -959,7 +959,7 @@
                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列  
                                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });

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

@@ -210,6 +210,7 @@
                //, page: true
                , cellMinWidth: 90
                , limit: 5000
                , totalRow: true
                //, limits: [50, 500, 5000, 20000]
            };

@@ -221,6 +222,7 @@
                //, page: true
                , cellMinWidth: 90
                , limit: 5000
                , totalRow: true
                //, limits: [50, 500, 5000, 20000]
            };

@@ -232,6 +234,7 @@
                //, page: true
                , cellMinWidth: 90
                , limit: 5000
                , totalRow: true
                //, limits: [50, 500, 5000, 20000]
            };
        }
@@ -300,7 +303,7 @@
                if ($.inArray(data[i].name, titleData0) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                }
                else if ($.inArray(data[i].name, totalArray) > -1) {
                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                } else {
                    switch (data[i].Type) {
@@ -327,7 +330,7 @@
        //#region æ¸²æŸ“表1
        function setInit_mainTable1(data1) {
            //需要设置合计行的列
            var totalArray = [];
            var totalArray = ["本色合计"];

            //整理子表的列
            var data = [];
@@ -343,7 +346,7 @@
                if ($.inArray(data[i].name, titleData1) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                }
                else if ($.inArray(data[i].name, totalArray) > -1) {
                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                } else {
                    switch (data[i].Type) {
@@ -386,7 +389,7 @@
                if ($.inArray(data[i].name, titleData2) > -1) {
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                }
                else if ($.inArray(data[i].name, totalArray) > -1) {
                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                } else {
                    switch (data[i].Type) {