diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js
index 0ac3f7c89..68d77535c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/FormView.js
@@ -6,7 +6,6 @@
*/
var acceptClick;
var keyValue = request('keyValue');
-var DisTitle = request('DisTitle');
var DisOffice = request('DisOffice');
// 设置权限
var setAuthorize;
@@ -45,12 +44,6 @@ var bootstrap = function ($, learun) {
},
bind: function () {
$('#AttachmentName').lrUploader();
- $('#DisTitle').lrDataItemSelect({ code: 'Dispatch' });
- if (DisTitle == "1") {
- $('#DisTitle').lrselectSet("1");
- } else {
- $('#DisTitle').lrselectSet("2");
- }
$('#DisOffice').lrDataItemSelect({ code: 'DisOffice' });
if (DisOffice == "1") {
$('#DisOffice').lrselectSet("1");
@@ -106,6 +99,7 @@ var bootstrap = function ($, learun) {
if (!!processId) {
formData.FlowNo = processId;
}
+ formData.WorkName = 2;
var postData = {
strEntity: JSON.stringify(formData)
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml
index d4606356d..74a185657 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.cshtml
@@ -10,14 +10,14 @@
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 86a9ee54b..837378a03 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
@@ -26,9 +26,9 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'form',
title: '新增',
- url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?DisTitle=' + 1 + '&DisOffice=' + 1,
+ url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?WorkName=' + 1 + '&DisOffice=' + 1,
width: 1000,
- height: 700,
+ height: 500,
callBack: function (id) {
var res = false;
// 验证数据
@@ -36,7 +36,6 @@ var bootstrap = function ($, learun) {
// 保存数据
if (res) {
-
res = top[id].save('', function () {
page.search();
});
@@ -61,9 +60,9 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'form',
title: '编辑',
- url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&DisTitle=' + 1 + '&DisOffice=' + 1,
+ url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&WorkName=' + 1 + '&DisOffice=' + 1,
width: 1000,
- height: 700,
+ height: 500,
callBack: function (id) {
var res = false;
// 验证数据
@@ -140,20 +139,8 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
headData: [
- { label: "工作名称", name: "WorkName", width: 200, align: "center" },
- {
- label: "标题", name: "DisTitle", width: 250, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'Dispatch',
- callback: function (_data) {
- callback(_data.text);
- }
- });
- }
- },
- { label: "来文", name: "DisFrom", width: 100, align: "center" },
+ { label: "标题", name: "DisTitle", width: 250, align: "center" },
+ { label: "来文单位", name: "DisFrom", width: 200, align: "center" },
{ label: "字", name: "DisWork", width: 80, align: "center" },
{ label: "号", name: "DisMark", width: 80, align: "center" },
{ label: "份数", name: "Copies", width: 50, align: "center" },
@@ -161,13 +148,9 @@ var bootstrap = function ($, learun) {
{ label: "月", name: "DisMonth", width: 50, align: "center" },
{ label: "日", name: "DisDay", width: 50, align: "center" },
{ label: "事由", name: "Reasons", width: 150, align: "center" },
- //{ label: "附件", name: "AttachmentName", width: 100, align: "center" },
- { label: "呈送意见", name: "Render", width: 100, align: "center" },
- {
- label: "呈送时间", name: "RenderDate", width: 100, align: "center",
- },
- { label: "收文", name: "DisOffice", width: 100, align: "center" },
- { label: "批示", name: "Instructions", width: 100, align: "center" },
+ { label: "呈送意见", name: "Render", width: 200, align: "center" },
+ { label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
+ { label: "收文单位", name: "DisOffice", width: 200, align: "center" },
{
label: "审批状态", name: "FlowNo", width: 100, align: "center",
formatter: function (cellvalue, row) {
@@ -188,7 +171,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
- param.DisTitle = 1;
+ param.WorkName = 1;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
@@ -196,7 +179,7 @@ var bootstrap = function ($, learun) {
if (res.code == 200) {
// 发起流程
var postData = {
- schemeCode: 'Dispatch',// 填写流程对应模板编号
+ schemeCode: 'DBSW',// 填写流程对应模板编号
processId: processId,
level: '1',
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml
index 9d32ef5d4..5d6ffe4dc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.cshtml
@@ -10,14 +10,14 @@
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 2a7d457bf..370397cc6 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
@@ -26,9 +26,9 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'form',
title: '新增',
- url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?DisTitle=' + 2 + '&DisOffice=' + 2,
+ url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?WorkName=' + 2 + '&DisOffice=' + 2,
width: 1000,
- height: 700,
+ height: 500,
callBack: function (id) {
var res = false;
// 验证数据
@@ -57,9 +57,9 @@ var bootstrap = function ($, learun) {
learun.layerForm({
id: 'form',
title: '编辑',
- url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&DisTitle=' + 2 + '&DisOffice=' + 2,
+ url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&WorkName=' + 2 + '&DisOffice=' + 2,
width: 1000,
- height: 700,
+ height: 500,
callBack: function (id) {
var res = false;
// 验证数据
@@ -136,21 +136,8 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/Dispatch/GetPageList',
headData: [
- { label: "工作名称", name: "WorkName", width: 200, align: "center" },
- //{ label: "标题", name: "DisTitle", width: 200, align: "center" },
- {
- label: "标题", name: "DisTitle", width: 250, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'Dispatch',
- callback: function (_data) {
- callback(_data.text);
- }
- });
- }
- },
- { label: "来文", name: "DisFrom", width: 100, align: "center" },
+ { label: "标题", name: "DisTitle", width: 250, align: "center" },
+ { label: "来文单位", name: "DisFrom", width: 200, align: "center" },
{ label: "字", name: "DisWork", width: 80, align: "center" },
{ label: "号", name: "DisMark", width: 80, align: "center" },
{ label: "份数", name: "Copies", width: 50, align: "center" },
@@ -158,13 +145,9 @@ var bootstrap = function ($, learun) {
{ label: "月", name: "DisMonth", width: 50, align: "center" },
{ label: "日", name: "DisDay", width: 50, align: "center" },
{ label: "事由", name: "Reasons", width: 150, align: "center" },
- //{ label: "附件", name: "AttachmentName", width: 100, align: "center" },
- { label: "呈送意见", name: "Render", width: 100, align: "center" },
- {
- label: "呈送时间", name: "RenderDate", width: 100, align: "center",
- },
- { label: "收文", name: "DisOffice", width: 100, align: "center" },
- { label: "批示", name: "Instructions", width: 100, align: "center" },
+ { label: "呈送意见", name: "Render", width: 200, align: "center" },
+ { label: "呈送时间", name: "RenderDate", width: 100, align: "center" },
+ { label: "收文单位", name: "DisOffice", width: 200, align: "center" },
{
label: "审批状态", name: "FlowNo", width: 100, align: "center",
formatter: function (cellvalue, row) {
@@ -185,7 +168,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
- param.DisTitle = 2;
+ param.WorkName = 2;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
@@ -193,7 +176,7 @@ var bootstrap = function ($, learun) {
if (res.code == 200) {
// 发起流程
var postData = {
- schemeCode: 'Dispatch',// 填写流程对应模板编号
+ schemeCode: 'XBSW',// 填写流程对应模板编号
processId: processId,
level: '1',
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml
index 54de804e9..937f546ad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml
@@ -221,7 +221,7 @@
-
来 文 @Model.DisFrom字@Model.DisWork号@Model.DisMark
+
来 文 单 位 @Model.DisFrom字@Model.DisWork号@Model.DisMark
份 数 @Model.Copies
年@Model.DisYear月@Model.DisMonth日@Model.DisDay
@@ -244,7 +244,6 @@
@Model.RenderDate.ToShortDateString().ToString().Replace("/", "-")
- @*
年月日*@
@@ -258,7 +257,7 @@
-
收 文 @Model.DisOffice字@Model.DisWork号@Model.DisMark年@Model.DisYear月@Model.DisMonth日@Model.DisDay
+
收 文 单 位 @Model.DisOffice字@Model.DisWork号@Model.DisMark年@Model.DisYear月@Model.DisMonth日@Model.DisDay
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs
index 4543437d6..e7780e034 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs
@@ -56,15 +56,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
- if (!queryParam["DisTitle"].IsEmpty())
+
+ if (!queryParam["WorkName"].IsEmpty())
{
- dp.Add("DisTitle", queryParam["DisTitle"].ToString(), DbType.String);
- strSql.Append(" AND t.DisTitle = @DisTitle ");
+ dp.Add("WorkName", queryParam["WorkName"].ToString(), DbType.String);
+ strSql.Append(" AND t.WorkName = @WorkName ");
}
- if (!queryParam["DisOffice"].IsEmpty())
+ if (!queryParam["DisTitle"].IsEmpty())
{
- dp.Add("DisOffice", "%" + queryParam["DisOffice"].ToString() + "%", DbType.String);
- strSql.Append(" AND t.DisOffice Like @DisOffice ");
+ dp.Add("DisTitle", "%" + queryParam["DisTitle"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.DisTitle Like @DisTitle ");
}
return this.BaseRepository("CollegeMIS").FindList