From 3db5943f6cdae171289fb688bf912e0fc61b095b Mon Sep 17 00:00:00 2001 From: edy Date: Thu, 5 Aug 2021 11:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=8A=9E=E5=85=AC=E6=96=87=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=8A=A5=E9=94=99.=E4=BA=8B=E7=94=B1=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=8F=AF=E4=B8=8B=E8=BD=BD=E5=B9=B6=E4=B8=94=E4=B8=8D?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DispatchController.cs | 5 ++++- .../Views/Dispatch/Index.js | 19 +++++++++++-------- .../Views/Dispatch/IndexXF.js | 16 ++++++---------- .../Views/Dispatch/ReadIndex.js | 9 ++------- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs index 3ad402737..1a6d2db42 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs @@ -232,7 +232,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { for (int i = 0; i < array.Length; i++) { - str += array[i].Substring(0, array[i].IndexOf(".")) + ","; + if (array[i].Trim()!="") + { + str += array[i].Substring(0, array[i].IndexOf(".")) + ","; + } } str.TrimEnd(','); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js index dec495114..42328e471 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js @@ -196,13 +196,16 @@ var bootstrap = function ($, learun) { success: function (res) { console.log(res); var bb = ''; - $.each(res.data, function(i, item) { - bb += '' + - item.F_FileName.substring(0,item.F_FileName.indexOf(".")) + - ',   '; + $.each(res.data, function (i, item) { + bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) }) + //$.each(res.data, function(i, item) { + // bb += '' + + // item.F_FileName.substring(0,item.F_FileName.indexOf(".")) + + // ',   '; + //}) callback(bb); } }); @@ -235,8 +238,8 @@ var bootstrap = function ($, learun) { if (res.code == 200) { // 发起流程 var postData = { - //schemeCode: 'Dispatch',// 本地 - schemeCode: 'DBSW',//线上 + schemeCode: 'Dispatch',// 本地 + //schemeCode: 'DBSW',//线上 processId: processId, level: '1', }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js index a21ec4c02..5ef70a1a0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js @@ -197,18 +197,14 @@ var bootstrap = function ($, learun) { success: function (res) { console.log(res); var bb = ''; - $.each(res.data, function(i, item) { - - bb += '' + - item.F_FileName.substring(0,item.F_FileName.indexOf(".")) + - ',   '; + $.each(res.data, function (i, item) { + bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) }) callback(bb); } }); - }}, + } + }, { label: "审批状态", name: "FlowNo", width: 100, align: "center", formatter: function (cellvalue, row) { @@ -241,8 +237,8 @@ var bootstrap = function ($, learun) { if (res.code == 200) { // 发起流程 var postData = { - //schemeCode: 'Dispatch',// 本地 - schemeCode: 'XBSW',// 线上 + schemeCode: 'Dispatch',// 本地 + //schemeCode: 'XBSW',// 线上 processId: processId, level: '1', }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js index 243d1da14..2bf0cabe0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js @@ -84,13 +84,8 @@ var bootstrap = function ($, learun) { success: function (res) { console.log(res); var bb = ''; - $.each(res.data, function(i, item) { - - bb += '' + - item.F_FileName.substring(0,item.F_FileName.indexOf(".")) + - ',   '; + $.each(res.data, function (i, item) { + bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) }) callback(bb); }