MES-WEB-LayUI.git

parent: 21bfbd76 | 补丁 | 提交 | show whitespace

yusijie

2022-11-22 c63d87a7a69a5025a7dae7135cc7f674709fd053

增加列合计

5个文件已修改

	WebTM/views/基础资料/生产基础资料/Gy_SOPBill.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/ProductionPlanReportList.html	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_SOPBill.html

@@ -210,9 +210,10 @@
            //#region èªå¨ææ¾æ¨¡å¼ä¸è·åé¡µé¢ä¿¡æ¯çæ¹æ³
            function set_LoadAgain() {
                get_Display(sWhere);
                get_Display2(sWhere);
                get_Display3(sWhere);
                setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
                setTimeout(function () { get_Display2(sWhere); }, 500);
                setTimeout(function () { get_Display2(sWhere); }, 500);
                setTimeout(function () { get_Display3(sWhere); }, 500);
                setTimeout(function () { ins.reload({ autoplay: false }) }, 1000);
            }
            //#endregion

@@ -338,7 +339,7 @@
                    , limit: 50
                    , height: 300
                    , cols: [[
                        , { field: 'è®¡å', title: 'è®¡å', width: 100 }
                        , { field: 'æºååå·', title: 'è®¡å', width: 100 }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 100, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }

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

@@ -388,10 +388,11 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
                        , { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
@@ -404,7 +405,7 @@
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
                        , { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
                        , { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 115 }
                        , { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§è®¢åæ°é', width: 115 }
                        , { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§è®¢åæ°é', width: 115, totalRow: true }
                        , { field: 'åè£æ è¯ä»£ç ', title: 'åè£æ è¯ä»£ç ', width: 115 }
                        , { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 115 }
                        , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115 }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -725,7 +725,7 @@
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -738,7 +738,11 @@
                                            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')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == 'æ°é' || data[i].name == 'åºç«æ°é' || data[i].name == 'æ¥åºæ°é') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            }                                            
                                    }
                                }
                            }
@@ -751,6 +755,7 @@
                                , data: data1.data
                                , height: 550
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBillList.html

@@ -815,7 +815,7 @@
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -828,7 +828,11 @@
                                            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')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == 'çäº§æ°é' || data[i].name == 'æµè½¬å¡æ°é' || data[i].name == 'å¥åºæ°é') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            }
                                    }
                                }
                            }
@@ -841,6 +845,7 @@
                                , data: data1.data
                                , height: 550
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -248,9 +248,10 @@
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
                    , totalRow: true
                    , height: 'full-70'
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                        , { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·', width: 160 }
                        , { field: 'å¯ä¸ID', title: 'å¯ä¸ID', width: 160 }
                        , { field: 'çäº§è®¢åå·', title: 'æ¹å·', width: 160 }
@@ -259,11 +260,11 @@
                        , { field: 'å¼å·¥æ¥æ', title: 'ä¸è¾¾æ¥æ', width: 160, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'è¦æ±å®å·¥', title: 'è¦æ±å®å·¥', width: 160, templet: "<div>{{d.è¦æ±å®å·¥ ==null ?'':layui.util.toDateString(d.è¦æ±å®å·¥, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 200 }
                        , { field: 'æ´æ¹', title: 'æ´æ¹', width: 160 }
                        , { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160 }
                        , { field: 'æ´æ¹', title: 'æ´æ¹', width: 160, totalRow: true }
                        , { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160, totalRow: true}
                        , { field: 'æ±æ¥åæ°é', title: 'æ±æ¥åæ°é', width: 160 }
                        , { field: 'å¥åº', title: 'å¥åº', width: 200 }
                        , { field: 'å¨å¶', title: 'å¨å¶', width: 200 }
                        , { field: 'å¥åº', title: 'å¥åº', width: 200, totalRow: true}
                        , { field: 'å¨å¶', title: 'å¨å¶', width: 200, totalRow: true }
                        , { field: 'å·¥åº', title: 'å·¥åº', width: 200 }
                        , { field: 'çç»', title: 'çç»', width: 200 }
                        , { field: 'ç¶æ', title: 'ç¶æ', width: 200 }
@@ -272,6 +273,25 @@
                        , { field: 'éå®è®¢åå·', title: 'éå®åå·', width: 160 }
                        , { field: 'ççº§', title: 'ççº§', width: 160 }
                    ]]
                    ,done: function (res) {
                        var count = 0;
                        var HBillNo = "";
                        for (var i = 0; i < res.data.length; i++) {
                            if (res.data[i]["æµè½¬å¡å·"] != HBillNo) {
                                count += res.data[i]["æ´æ¹"];
                                HBillNo = res.data[i]["æµè½¬å¡å·"];
                            }
                        }
                        var divArr = $(".layui-table-total div.layui-table-cell");
                        $.each(divArr, function (index, item) {
                            var _div = $(item);
                            var content = _div.html();
                            if (index == 9) {
                                content = count;
                            }
                            _div.html(content);
                        });
                    }
                };
            }

@@ -285,6 +305,18 @@
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            //var num = 0;
                            //for (let i = 0; i < data1.data.length; i++) {
                            //    for (let j = i + 1; j < data1.data.length; j++) {
                            //        if (data1.data[i].æµè½¬å¡å· === data1.data[j].æµè½¬å¡å·) {
                            //            //num += data1.data[i].æ´æ¹;
                            //            //data1.data[i].filter(() => {
                            //            //    return 
                            //            //})
                            //            data1.data[j].æ´æ¹ = '';
                            //        }
                            //    }
                            //}
                            table.render(option);
                            layer.close(wait);
                        } else {
@@ -418,7 +450,9 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                                }
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

			@@ -210,9 +210,10 @@
			//#region èªå¨ææ¾æ¨¡å¼ä¸è·åé¡µé¢ä¿¡æ¯çæ¹æ³
			function set_LoadAgain() {
			get_Display(sWhere);
			get_Display2(sWhere);
			get_Display3(sWhere);
			setTimeout(function () { ins.reload({ autoplay: false }) }, 500);
			setTimeout(function () { get_Display2(sWhere); }, 500);
			setTimeout(function () { get_Display2(sWhere); }, 500);
			setTimeout(function () { get_Display3(sWhere); }, 500);
			setTimeout(function () { ins.reload({ autoplay: false }) }, 1000);
			}
			//#endregion

			@@ -338,7 +339,7 @@
			, limit: 50
			, height: 300
			, cols: [[
			, { field: 'è®¡å', title: 'è®¡å', width: 100 }
			, { field: 'æºååå·', title: 'è®¡å', width: 100 }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 100, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }

			@@ -388,10 +388,11 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
			, { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			@@ -404,7 +405,7 @@
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 115 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§è®¢åæ°é', width: 115 }
			, { field: 'çäº§ä»»å¡åæ°é', title: 'çäº§è®¢åæ°é', width: 115, totalRow: true }
			, { field: 'åè£æ è¯ä»£ç ', title: 'åè£æ è¯ä»£ç ', width: 115 }
			, { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 115 }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115 }

			@@ -725,7 +725,7 @@
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			@@ -738,7 +738,11 @@
			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')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'æ°é' \|\| data[i].name == 'åºç«æ°é' \|\| data[i].name == 'æ¥åºæ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			}
			@@ -751,6 +755,7 @@
			, data: data1.data
			, height: 550
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]

			@@ -815,7 +815,7 @@
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			@@ -828,7 +828,11 @@
			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')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'çäº§æ°é' \|\| data[i].name == 'æµè½¬å¡æ°é' \|\| data[i].name == 'å¥åºæ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			}
			@@ -841,6 +845,7 @@
			, data: data1.data
			, height: 550
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]

			@@ -248,9 +248,10 @@
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·', width: 160 }
			, { field: 'å¯ä¸ID', title: 'å¯ä¸ID', width: 160 }
			, { field: 'çäº§è®¢åå·', title: 'æ¹å·', width: 160 }
			@@ -259,11 +260,11 @@
			, { field: 'å¼å·¥æ¥æ', title: 'ä¸è¾¾æ¥æ', width: 160, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è¦æ±å®å·¥', title: 'è¦æ±å®å·¥', width: 160, templet: "<div>{{d.è¦æ±å®å·¥ ==null ?'':layui.util.toDateString(d.è¦æ±å®å·¥, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 200 }
			, { field: 'æ´æ¹', title: 'æ´æ¹', width: 160 }
			, { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160 }
			, { field: 'æ´æ¹', title: 'æ´æ¹', width: 160, totalRow: true }
			, { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160, totalRow: true}
			, { field: 'æ±æ¥åæ°é', title: 'æ±æ¥åæ°é', width: 160 }
			, { field: 'å¥åº', title: 'å¥åº', width: 200 }
			, { field: 'å¨å¶', title: 'å¨å¶', width: 200 }
			, { field: 'å¥åº', title: 'å¥åº', width: 200, totalRow: true}
			, { field: 'å¨å¶', title: 'å¨å¶', width: 200, totalRow: true }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 200 }
			, { field: 'çç»', title: 'çç»', width: 200 }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 200 }
			@@ -272,6 +273,25 @@
			, { field: 'éå®è®¢åå·', title: 'éå®åå·', width: 160 }
			, { field: 'ççº§', title: 'ççº§', width: 160 }
			]]
			,done: function (res) {
			var count = 0;
			var HBillNo = "";
			for (var i = 0; i < res.data.length; i++) {
			if (res.data[i]["æµè½¬å¡å·"] != HBillNo) {
			count += res.data[i]["æ´æ¹"];
			HBillNo = res.data[i]["æµè½¬å¡å·"];
			}
			}
			var divArr = $(".layui-table-total div.layui-table-cell");
			$.each(divArr, function (index, item) {
			var _div = $(item);
			var content = _div.html();
			if (index == 9) {
			content = count;
			}
			_div.html(content);
			});
			}
			};
			}

			@@ -285,6 +305,18 @@
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			//var num = 0;
			//for (let i = 0; i < data1.data.length; i++) {
			// for (let j = i + 1; j < data1.data.length; j++) {
			// if (data1.data[i].æµè½¬å¡å· === data1.data[j].æµè½¬å¡å·) {
			// //num += data1.data[i].æ´æ¹;
			// //data1.data[i].filter(() => {
			// // return
			// //})
			// data1.data[j].æ´æ¹ = '';
			// }
			// }
			//}
			table.render(option);
			layer.close(wait);
			} else {
			@@ -418,7 +450,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;