bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

【修改】公文接收：打印优化；党政公文归档，行政公文归档：列表显示优化；

金隅分支
dyy 2 years ago
parent
1df7b50063
commit
b498e70394
5 changed files with 81 additions and 79 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +61
    -62
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.cshtml
  2. +17
    -14
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.js
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs

+ 61
- 62
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.cshtml View File

@@ -78,69 +78,68 @@
</style>
</head>
<body>
<div id="table">
<div class="tableBox">
<div class="tableT">北京金隅科技学校</div>
<div class="tableT">收文处理专用纸（收文登记）</div>
<table class="table">
<tr>
<td style="width: 80px;">收文</td>
<td id="RReceiveUnit"></td>
<td style="width: 80px;">字第</td>
<td id="swz"></td>
<td style="width: 80px;">号</td>
<td>收文日期</td>
<td id="RReceiveTime"></td>
</tr>
<tr>
<td>来文</td>
<td id="RSourceUnit"></td>
<td>字第</td>
<td id="lwz"></td>
<td>号</td>
<td></td>
<td></td>
</tr>
<tr>
<td>收文标题</td>
<td colspan="6" id="RTitle"></td>
</tr>
<tr>
<td>处理意见</td>
<td colspan="6" id="yj1"></td>
</tr>
<tr>
<td>领导批示</td>
<td colspan="6">
<div class="tableTxt1" id="yj2"></div>
<div class="tableTxt2" id="xiaozhanginfo"></div>
</td>
</tr>
<tr>
<td>部门处理情况</td>
<td colspan="6" id="yj3">
</td>
</tr>
<tr>
<td>经办人</td>
<td colspan="4" id="SenderId"></td>
<td>办结日期</td>
<td id="overDate"></td>
</tr>
</table>
<div id="table">
<div class="tableBox">
<div class="tableT">北京金隅科技学校</div>
<div class="tableT">收文处理专用纸（收文登记）</div>
<table class="table">
<tr>
<td style="width: 80px;">收文</td>
<td id="RReceiveUnit"></td>
<td style="width: 80px;">字第</td>
<td id="swz"></td>
<td style="width: 80px;">号</td>
<td>收文日期</td>
<td id="RReceiveTime"></td>
</tr>
<tr>
<td>来文</td>
<td id="RSourceUnit"></td>
<td>字第</td>
<td id="lwz"></td>
<td>号</td>
<td></td>
<td></td>
</tr>
<tr>
<td>收文标题</td>
<td colspan="6" id="RTitle"></td>
</tr>
<tr>
<td>处理意见</td>
<td colspan="6" id="yj1"></td>
</tr>
<tr>
<td>领导批示</td>
<td colspan="6">
<div class="tableTxt1" id="yj2"></div>
<div class="tableTxt2" id="xiaozhanginfo"></div>
</td>
</tr>
<tr>
<td>部门处理情况</td>
<td colspan="6" id="yj3"></td>
</tr>
<tr>
<td>经办人</td>
<td colspan="4" id="SenderId"></td>
<td>办结日期</td>
<td id="overDate"></td>
</tr>
</table>
</div>
</div>
</div>
<div class="btn">打印</div>
<script src="js/jquery-1.4.4.min.js"></script>
<script src="js/jquery.jqprint-0.3.js"></script>
<script>
$('.btn').click(function(){
$('.tableBox').jqprint();
})
</script>



<div class="btn">打印</div>
<script src="~/Content/jquery/jquery-1.10.2.min.js"></script>
<script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
<script>
$('.btn').click(function () {
$('.tableBox').jqprint();
})
</script>
</body>
</html>



+ 17
- 14
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/PrintView.js View File

@@ -11,7 +11,7 @@ var bootstrap = function ($, learun) {
var processId = '';
var page = {
init: function () {
console.log(keyValue);
//console.log(keyValue);
page.bind();
},
bind: function () {
@@ -19,11 +19,11 @@ var bootstrap = function ($, learun) {
function(data) {
var data = JSON.parse(data).data;
var entityItem = data.entityItem;
console.log(data);
//console.log(data);
//console.log(entityItem);
learun.clientdata.getAsync('department', {
key: data.entity.RReceiveUnit,
callback: function (_data) {
console.log(_data);
$('#RReceiveUnit').html(_data.name);
}
@@ -33,15 +33,17 @@ var bootstrap = function ($, learun) {
$('#RSourceUnit').html(data.entity.RSourceUnit);
$('#lwz').html(data.entity.lwz);
$('#RTitle').html(data.entity.RTitle);
$('#yj1').html(entityItem[0].SpecifyReceiver);
$('#yj2').html(entityItem[1].SpecifyReceiver);
learun.clientdata.getAsync('user', {
key: entityItem[1].ReceiverId,
callback: function (_data) {
console.log(_data);
$('#xiaozhanginfo').html(_data.name + ' ' + (entityItem[1].ReadTime || '').substr(0, 10));
}
});
$('#yj1').html(entityItem[0] != null? entityItem[0].SpecifyReceiver:"");
$('#yj2').html(entityItem[1] != null ? entityItem[1].SpecifyReceiver : "");
if (entityItem[1] != null) {
learun.clientdata.getAsync('user', {
key: entityItem[1].ReceiverId,
callback: function (_data) {
$('#xiaozhanginfo').html(_data.name + ' ' + (entityItem[1].ReadTime || '').substr(0, 10));
}
});
}


learun.clientdata.getAsync('user', {
@@ -70,8 +72,9 @@ var bootstrap = function ($, learun) {
});
$('#yj3').html(text);

$('#overDate').html(data.entityItem[data.entityItem.length - 1].ReadTime.substr(0,10));
if (data.entityItem[data.entityItem.length - 1] != null) {
$('#overDate').html(data.entityItem[data.entityItem.length - 1].ReadTime.substr(0, 10));
}
});

},


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js View File

@@ -122,7 +122,7 @@ var bootstrap = function ($, learun) {
param = param || {};
param.StartTime = startTime;
param.EndTime = endTime;
param.SqlParameter = ' AND SendFlag=4';
param.SqlParameter = ' AND SendFlag=4 and STypeId=1';
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js View File

@@ -126,7 +126,7 @@ var bootstrap = function ($, learun) {
},
search: function (param) {
param = param || {};
param.SqlParameter = ' AND SendFlag=4';
param.SqlParameter = ' AND SendFlag=4 and STypeId=3';
param.StartTime = startTime;
param.EndTime = endTime;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs View File

@@ -44,7 +44,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (queryParam["StartTime"].ToString() != "1753-01-01" && queryParam["EndTime"].ToString() != "3000-01-01")
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty() && queryParam["StartTime"].ToString() != "1753-01-01" && queryParam["EndTime"].ToString() != "3000-01-01")
{
dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);


Write Preview
Loading…
Cancel
Save