Browse Source

党办公文打印报错.事由取消可下载并且不改变字体

master
edy 3 years ago
parent
commit
3db5943f6c
4 changed files with 23 additions and 26 deletions
  1. +4
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs
  2. +11
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js
  3. +6
    -10
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js
  4. +2
    -7
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js

+ 4
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs View File

@@ -232,7 +232,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{ {
for (int i = 0; i < array.Length; i++) 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(','); str.TrimEnd(',');
} }


+ 11
- 8
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js View File

@@ -196,13 +196,16 @@ var bootstrap = function ($, learun) {
success: function (res) { success: function (res) {
console.log(res); console.log(res);
var bb = ''; var bb = '';
$.each(res.data, function(i, item) {
bb += '<span onclick="downLoad(\'' +
item.F_Id +
'\')" style="color:blue">' +
item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
'</span>,&nbsp;&nbsp;&nbsp;';
$.each(res.data, function (i, item) {
bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
}) })
//$.each(res.data, function(i, item) {
// bb += '<span onclick="downLoad(\'' +
// item.F_Id +
// '\')" style="color:blue">' +
// item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
// '</span>,&nbsp;&nbsp;&nbsp;';
//})
callback(bb); callback(bb);
} }
}); });
@@ -235,8 +238,8 @@ var bootstrap = function ($, learun) {
if (res.code == 200) { if (res.code == 200) {
// 发起流程 // 发起流程
var postData = { var postData = {
//schemeCode: 'Dispatch',// 本地
schemeCode: 'DBSW',//线上
schemeCode: 'Dispatch',// 本地
//schemeCode: 'DBSW',//线上
processId: processId, processId: processId,
level: '1', level: '1',
}; };


+ 6
- 10
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js View File

@@ -197,18 +197,14 @@ var bootstrap = function ($, learun) {
success: function (res) { success: function (res) {
console.log(res); console.log(res);
var bb = ''; var bb = '';
$.each(res.data, function(i, item) {

bb += '<span onclick="downLoad(\'' +
item.F_Id +
'\')" style="color:blue">' +
item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
'</span>,&nbsp;&nbsp;&nbsp;';
$.each(res.data, function (i, item) {
bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
}) })
callback(bb); callback(bb);
} }
}); });
}},
}
},
{ {
label: "审批状态", name: "FlowNo", width: 100, align: "center", label: "审批状态", name: "FlowNo", width: 100, align: "center",
formatter: function (cellvalue, row) { formatter: function (cellvalue, row) {
@@ -241,8 +237,8 @@ var bootstrap = function ($, learun) {
if (res.code == 200) { if (res.code == 200) {
// 发起流程 // 发起流程
var postData = { var postData = {
//schemeCode: 'Dispatch',// 本地
schemeCode: 'XBSW',// 线上
schemeCode: 'Dispatch',// 本地
//schemeCode: 'XBSW',// 线上
processId: processId, processId: processId,
level: '1', level: '1',
}; };


+ 2
- 7
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/ReadIndex.js View File

@@ -84,13 +84,8 @@ var bootstrap = function ($, learun) {
success: function (res) { success: function (res) {
console.log(res); console.log(res);
var bb = ''; var bb = '';
$.each(res.data, function(i, item) {

bb += '<span onclick="downLoad(\'' +
item.F_Id +
'\')" style="color:blue">' +
item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
'</span>,&nbsp;&nbsp;&nbsp;';
$.each(res.data, function (i, item) {
bb += item.F_FileName.substring(0, item.F_FileName.indexOf("."))
}) })
callback(bb); callback(bb);
} }


Loading…
Cancel
Save