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

wtt

2024-11-06 7225f043da62c39397e6561b402a66b33488fb12

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

 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/Éú²ú¹ÜÀí/Èռƻ®±¨±í/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/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2434,7 +2434,6 @@
                        if (result.count == 1) {
                            var data = option.data
                            data.forEach((item) => {

                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
                                        item[itemobj] = "";
@@ -2442,19 +2441,13 @@
                                    if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                    }
                                    if (itemobj === '规格型号') {
                                        item[itemobj] = item[itemobj].replace(/,/g, '，');  // æ›¿æ¢è‹±æ–‡é€—号为中文逗号
                                    }
                                }


                                //// å¦‚果某个字段的值太长，需要去除换行符
                                //if (item.规格型号.length > 0) {  // å‡è®¾å­—段名为field
                                //    item.规格型号 = item.规格型号.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                //}
                                //if (item.产品名称.length > 0) {  // å‡è®¾å­—段名为field
                                //    item.产品名称 = item.产品名称.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                //}
                            });

                            table.exportFile(ins.config.id, option.data, "xls");
                            table.exportFile(ins.config.id, data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }