Skip to content

Commit 40a10b8

Browse files
AltyntauSourceAltyntauSource
AltyntauSource
authored and
AltyntauSource
committed
2 parents 44a763c + 403f53c commit 40a10b8

File tree

6 files changed

+337
-184
lines changed

6 files changed

+337
-184
lines changed

‎RapidDoc/Controllers/CustomController.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,6 +1496,24 @@ public ActionResult GetRequestTRU(RapidDoc.Models.ViewModels.USR_REQ_HY_RequestT
14961496

14971497
return PartialView("USR_REQ_HY_RequestTRU_View_Full", model);
14981498
}
1499+
public ActionResult GetManualOfficeMemo(RapidDoc.Models.ViewModels.USR_OFM_UIT_OfficeMemo_View model)
1500+
{
1501+
DocumentTable document = _DocumentService.Find(model.DocumentTableId);
1502+
1503+
if ((document.DocumentState == RapidDoc.Models.Repository.DocumentState.Agreement || document.DocumentState == RapidDoc.Models.Repository.DocumentState.Execution) && _DocumentService.isSignDocument(document.Id))
1504+
{
1505+
var current = _DocumentService.GetCurrentSignStep(document.Id);
1506+
if (current != null)
1507+
{
1508+
if (current.Any(x => x.ActivityName == "Начальник службы" || x.ActivityName == "Начальник управления"))
1509+
{
1510+
return PartialView("USR_OFM_UIT_OfficeMemo_Edit_Part", model);
1511+
}
1512+
}
1513+
}
1514+
1515+
return PartialView("USR_OFM_UIT_OfficeMemo_View_Full", model);
1516+
}
14991517

15001518
public ActionResult GetRequestCTPTRU(RapidDoc.Models.ViewModels.USR_REQ_IT_CTP_RequestTRU_View model)
15011519
{

‎RapidDoc/RapidDoc.Web.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,6 +1548,8 @@
15481548
<Content Include="Views\Custom\USR_REQ_UZL_RequestForContractNoneresidentCustoms_Edit.cshtml" />
15491549
<Content Include="Views\Custom\USR_REQ_UZL_RequestForContractNoneresidentCustoms_Edit_Manual.cshtml" />
15501550
<Content Include="Views\Custom\USR_REQ_UZL_RequestForContractNoneresidentCustoms_View.cshtml" />
1551+
<Content Include="Views\Custom\USR_OFM_UIT_OfficeMemo_View_Full.cshtml" />
1552+
<Content Include="Views\Custom\USR_OFM_UIT_OfficeMemo_Edit_Part.cshtml" />
15511553
</ItemGroup>
15521554
<ItemGroup>
15531555
<WCFMetadata Include="Service References\" />

‎RapidDoc/Views/Custom/USR_OFM_UIT_OfficeMemo_Edit_Part.cshtml

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
@model RapidDoc.Models.ViewModels.USR_OFM_UIT_OfficeMemo_View
2+
@using RapidDoc.Extensions;
3+
4+
@Html.HiddenFor(model => model.Id)
5+
@Html.HiddenFor(model => model.DocumentTableId)
6+
@Html.HiddenFor(model => model.ItemCauseTableId)
7+
@Html.HiddenFor(model => model.DocumentWhom)
8+
@Html.HiddenFor(model => model.Parallel)
9+
@Html.HiddenFor(model => model.AdditionalText)
10+
11+
<div class="row">
12+
<div class="col-md-12">
13+
<div>
14+
<h6>@Html.EnumToDescription(Model.Folder) / @Html.DisplayTextFor(model => Model.ItemCauseNumber)</h6>
15+
</div>
16+
</div>
17+
</div>
18+
19+
<br />
20+
<div class="panel panel-default">
21+
<table class="table-bordered">
22+
<tbody>
23+
<tr>
24+
<td><span class="input-group-addon" id="sizing-addon1" style="height:43px; width:100px;border-width:0px; text-align:left;"><strong>Кому:</strong></span></td>
25+
<td>@Html.TextBoxFor(model => Model.Whom, new { @class = "form-control", @size = 256, @maxlength = 256, placeholder = "Кому", aria_describedby = "sizing-addon3", @style = "border-width:0px" })</td>
26+
</tr>
27+
<tr>
28+
<td><span class="input-group-addon" id="sizing-addon1" style="height: 43px;width:100px;border-width:0px; text-align:left;"><strong>Копия:</strong></span></td>
29+
<td>@Html.TextBoxFor(model => Model.DocumentCopy, new { @class = "form-control", @size = 256, @maxlength = 256, placeholder = "Копия", aria_describedby = "sizing-addon3", @style = "border-width:0px" })</td>
30+
</tr>
31+
<tr>
32+
<td><span class="input-group-addon" id="sizing-addon1" style="height:43px;width:100px;border-width:0px; text-align:left;"><strong>От кого:<span class="required">*</span></strong></span></td>
33+
<td>@Html.TextBoxFor(model => Model.FromWhom, new { @class = "form-control", @size = 256, @maxlength = 256, placeholder = "От кого", aria_describedby = "sizing-addon3", @style = "border-width:0px" })</td>
34+
</tr>
35+
<tr>
36+
<td><span class="input-group-addon" id="sizing-addon1" style="height:43px;width:100px;border-width:0px; text-align:left;"><strong>Тема:<span class="required">*</span></strong></span></td>
37+
<td>@Html.TextBoxFor(model => Model.DocumentTitle, new { @class = "form-control", @size = 256, @maxlength = 256, placeholder = "Тема", aria_describedby = "sizing-addon3", @style = "border-width:0px" })</td>
38+
</tr>
39+
</tbody>
40+
</table>
41+
</div>
42+
<div class="editor-field">
43+
@Html.TextAreaFor(model => Model.MainField, new { @class = "form-control summernote" })
44+
</div>
45+
46+
<div class="modal fade addusers-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
47+
<div class="modal-dialog">
48+
<div class="modal-content modal-lg">
49+
<div class="modal-header">
50+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
51+
<h4 class="modal-title">@CustomRes.Custom.Users</h4>
52+
</div>
53+
<div class="modal-body" style="min-height: 180px;">
54+
<div class="input-group">
55+
<span class="input-group-addon">
56+
<a href="#" class="hidden-print" data-toggle="modal" data-target=".documentwhom-modal"><span class="fa fa-users fa-lg" aria-hidden="false"></span></a>
57+
</span>
58+
@Html.TextBox("Flow", "", new { @class = "form-control", @data_role = "tagsinputGroup2", @size = 256, @maxlength = 256, placeholder = "Маршрут согласования" })
59+
</div>
60+
<br />
61+
<span>
62+
@Html.CheckBox("IsParallel", true, new { @data_labelauty = "Параллельно|Параллельно" })
63+
</span>
64+
65+
<a data-toggle="collapse" href="#collapseSettings" aria-expanded="false" aria-controls="collapseSettings">Добавить сопроводительный текст</a>
66+
<div class="collapse" id="collapseSettings">
67+
<div class="editor-field">
68+
@Html.TextArea("AdditionaltextCZ", "", new { @class = "form-control" })
69+
</div>
70+
</div>
71+
<br /><br />
72+
<h4 class="modal-title">@FieldNameRes.FieldNameResource.Notify</h4>
73+
<div class="editor-field">
74+
@Html.CheckBox("IsNotifyCZ", true)
75+
</div>
76+
77+
<div class="modal-footer">
78+
<button type="submit" class="btn btn-primary" name="action:AddUsersDocumentCZ">@UIElementRes.UIElement.AddUsers</button>
79+
<button type="button" class="btn btn-default" data-dismiss="modal">@UIElementRes.UIElement.Cancel</button>
80+
</div>
81+
</div>
82+
</div>
83+
</div>
84+
</div>
85+
<div class="modal fade documentwhom-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
86+
<div class="modal-dialog modal-sidebar">
87+
<div class="modal-content">
88+
<div class="modal-header">
89+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
90+
<h4 class="modal-title">@UIElementRes.UIElement.DistributionGroup - Поле Кому</h4>
91+
</div>
92+
<div class="modal-body" style="min-height:700px;">
93+
@Html.Action("RoleLookup", "Role", new { prefix = "whom" })
94+
</div>
95+
</div>
96+
</div>
97+
</div>
98+
<div class="modal fade rejectcz-modal-sm" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
99+
<div class="modal-dialog modal-dialog">
100+
<div class="modal-content">
101+
<div class="modal-header">
102+
<div class="alert_placeholder"></div>
103+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
104+
<h4 class="modal-title">Отмена документа</h4>
105+
</div>
106+
<div class="modal-body" style="min-height:250px;">
107+
@Html.TextArea("RejectComment", new { @class = "form-control", @placeholder = "Обязательно укажите причину отмены" })
108+
<br>
109+
<div>
110+
<button type="button" class="btn btn-default pull-right" data-dismiss="modal">@UIElementRes.UIElement.Cancel</button>
111+
<button type="submit" id="rejectCZ" class="btn btn-danger pull-right" name="action:RejectDocumentCZ">@UIElementRes.UIElement.Reject</button>
112+
</div>
113+
</div>
114+
</div>
115+
</div>
116+
</div>
117+
<div class="modal fade approvecz-modal-sm" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
118+
<div class="modal-dialog modal-dialog">
119+
<div class="modal-content">
120+
<div class="modal-header">
121+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
122+
<h4 class="modal-title">Утверждение документа</h4>
123+
</div>
124+
<div class="modal-body" style="min-height:200px;">
125+
@Html.TextArea("ApproveComment", new { @class = "form-control", @placeholder = "Замечания" })
126+
<br>
127+
<div>
128+
<button type="button" class="btn btn-default pull-right" data-dismiss="modal">@UIElementRes.UIElement.Cancel</button>
129+
<button type="submit" class="btn btn-success pull-right" name="action:ApproveDocumentCZ">@UIElementRes.UIElement.Approve</button>
130+
</div>
131+
</div>
132+
</div>
133+
</div>
134+
</div>
135+
136+
<script type="text/javascript">
137+
$(function () {
138+
bootstrap_alert = function () { }
139+
bootstrap_alert.warning = function (message) {
140+
$('.alert_placeholder').html('<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span><span class="sr-only">Error:</span>' + message + '</div>')
141+
}
142+
$('.distributiongrouplink_whom').click(function () {
143+
var element = $(event.target);
144+
var tagId = element.attr('data-itemid') + ', ' + element.attr('data-rolename');
145+
$('input[data-role=tagsinputGroup2]').tagsinput('add', { value: tagId, text: element.text() });
146+
});
147+
148+
$('#rejectCZ').click(function (event) {
149+
var comment = $('#RejectComment').val();
150+
if (comment == "") {
151+
bootstrap_alert.warning('Необходимо заполнить причину отмены');
152+
event.preventDefault();
153+
return false;
154+
}
155+
});
156+
});
157+
</script>

‎RapidDoc/Views/Custom/USR_OFM_UIT_OfficeMemo_View.cshtml

Lines changed: 1 addition & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -1,188 +1,5 @@
11
@model RapidDoc.Models.ViewModels.USR_OFM_UIT_OfficeMemo_View
2-
@using RapidDoc.Extensions;
32

4-
@Html.HiddenFor(model => Model.DocumentWhom)
5-
@Html.HiddenFor(model => Model.AdditionalText)
6-
<div class="row">
7-
<div class="col-md-12">
8-
<div>
9-
<h6>@Html.EnumToDescription(Model.Folder) / @Html.DisplayTextFor(model => Model.ItemCauseNumber)</h6>
10-
</div>
11-
</div>
12-
</div>
13-
<div class="row hidden-print">
14-
<div class="col-xs-2">
15-
@Html.LabelFor(model => Model.Whom):
16-
</div>
17-
<div class="col-xs-10">
18-
@Html.DisplayTextFor(model => Model.Whom)
19-
</div>
20-
</div>
21-
<div class="row hidden-print">
22-
<div class="col-xs-2">
23-
@Html.LabelFor(model => Model.DocumentCopy):
24-
</div>
25-
<div class="col-xs-10">
26-
@Html.DisplayTextFor(model => Model.DocumentCopy)
27-
</div>
28-
</div>
29-
<div class="row hidden-print">
30-
<div class="col-xs-2">
31-
@Html.LabelFor(model => Model.FromWhom):
32-
</div>
33-
<div class="col-xs-10">
34-
@Html.DisplayTextFor(model => Model.FromWhom)
35-
</div>
36-
</div>
37-
<div class="row hidden-print">
38-
<div class="col-xs-2">
39-
@Html.LabelFor(model => Model.DocumentTitle):
40-
</div>
41-
<div class="col-xs-10">
42-
@Html.DisplayTextFor(model => Model.DocumentTitle)
43-
</div>
44-
</div>
3+
@Html.Action("GetManualOfficeMemo", "Custom", new { model = Model })
454

46-
<div class="row visible-print">
47-
<div class="col-xs-12">
48-
<br />
49-
@Html.LabelFor(model => Model.Whom): @Html.DisplayTextFor(model => Model.Whom)
50-
</div>
51-
</div>
52-
<div class="row visible-print">
53-
<div class="col-xs-12">
54-
<br />
55-
@Html.LabelFor(model => Model.DocumentCopy): @Html.DisplayTextFor(model => Model.DocumentCopy)
56-
</div>
57-
</div>
58-
<div class="row visible-print">
59-
<div class="col-xs-12">
60-
<br />
61-
@Html.LabelFor(model => Model.FromWhom): @Html.DisplayTextFor(model => Model.FromWhom)
62-
</div>
63-
</div>
645

65-
<div class="row visible-print">
66-
<div class="col-xs-12">
67-
<br />
68-
@Html.LabelFor(model => Model.DocumentTitle): @Html.DisplayTextFor(model => Model.DocumentTitle)
69-
</div>
70-
</div>
71-
<div class="row" style="background-color: #fff; border-bottom: 2px solid #bdc3c7; border-top: 2px solid #bdc3c7;">
72-
<div class="col-xs-12">
73-
@Html.Raw(Model.MainField)
74-
</div>
75-
</div>
76-
77-
<div class="modal fade addusers-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
78-
<div class="modal-dialog">
79-
<div class="modal-content modal-lg">
80-
<div class="modal-header">
81-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
82-
<h4 class="modal-title">@CustomRes.Custom.Users</h4>
83-
</div>
84-
<div class="modal-body" style="min-height: 180px;">
85-
<div class="input-group">
86-
<span class="input-group-addon">
87-
<a href="#" class="hidden-print" data-toggle="modal" data-target=".documentwhom-modal"><span class="fa fa-users fa-lg" aria-hidden="false"></span></a>
88-
</span>
89-
@Html.TextBox("Flow", "", new { @class = "form-control", @data_role = "tagsinputGroup2", @size = 256, @maxlength = 256, placeholder = "Маршрут согласования" })
90-
</div>
91-
<br />
92-
<span>
93-
@Html.CheckBox("IsParallel", true, new { @data_labelauty = "Параллельно|Параллельно" })
94-
</span>
95-
96-
<a data-toggle="collapse" href="#collapseSettings" aria-expanded="false" aria-controls="collapseSettings">Добавить сопроводительный текст</a>
97-
<div class="collapse" id="collapseSettings">
98-
<div class="editor-field">
99-
@Html.TextArea("AdditionaltextCZ","", new { @class = "form-control" })
100-
</div>
101-
</div>
102-
<br /><br />
103-
<h4 class="modal-title">@FieldNameRes.FieldNameResource.Notify</h4>
104-
<div class="editor-field">
105-
@Html.CheckBox("IsNotifyCZ", true)
106-
</div>
107-
108-
<div class="modal-footer">
109-
<button type="submit" class="btn btn-primary" name="action:AddUsersDocumentCZ">@UIElementRes.UIElement.AddUsers</button>
110-
<button type="button" class="btn btn-default" data-dismiss="modal">@UIElementRes.UIElement.Cancel</button>
111-
</div>
112-
</div>
113-
</div>
114-
</div>
115-
</div>
116-
<div class="modal fade documentwhom-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
117-
<div class="modal-dialog modal-sidebar">
118-
<div class="modal-content">
119-
<div class="modal-header">
120-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
121-
<h4 class="modal-title">@UIElementRes.UIElement.DistributionGroup - Поле Кому</h4>
122-
</div>
123-
<div class="modal-body" style="min-height:700px;">
124-
@Html.Action("RoleLookup", "Role", new { prefix = "whom" })
125-
</div>
126-
</div>
127-
</div>
128-
</div>
129-
<div class="modal fade rejectcz-modal-sm" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
130-
<div class="modal-dialog modal-dialog">
131-
<div class="modal-content">
132-
<div class="modal-header">
133-
<div class="alert_placeholder"></div>
134-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
135-
<h4 class="modal-title">Отмена документа</h4>
136-
</div>
137-
<div class="modal-body" style="min-height:250px;">
138-
@Html.TextArea("RejectComment", new { @class = "form-control", @placeholder = "Обязательно укажите причину отмены" })
139-
<br>
140-
<div>
141-
<button type="button" class="btn btn-default pull-right" data-dismiss="modal">@UIElementRes.UIElement.Cancel</button>
142-
<button type="submit" id="rejectCZ" class="btn btn-danger pull-right" name="action:RejectDocumentCZ">@UIElementRes.UIElement.Reject</button>
143-
</div>
144-
</div>
145-
</div>
146-
</div>
147-
</div>
148-
<div class="modal fade approvecz-modal-sm" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
149-
<div class="modal-dialog modal-dialog">
150-
<div class="modal-content">
151-
<div class="modal-header">
152-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
153-
<h4 class="modal-title">Утверждение документа</h4>
154-
</div>
155-
<div class="modal-body" style="min-height:200px;">
156-
@Html.TextArea("ApproveComment", new { @class = "form-control", @placeholder = "Замечания" })
157-
<br>
158-
<div>
159-
<button type="button" class="btn btn-default pull-right" data-dismiss="modal">@UIElementRes.UIElement.Cancel</button>
160-
<button type="submit" class="btn btn-success pull-right" name="action:ApproveDocumentCZ">@UIElementRes.UIElement.Approve</button>
161-
</div>
162-
</div>
163-
</div>
164-
</div>
165-
</div>
166-
167-
<script type="text/javascript">
168-
$(function () {
169-
bootstrap_alert = function () { }
170-
bootstrap_alert.warning = function (message) {
171-
$('.alert_placeholder').html('<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span><span class="sr-only">Error:</span>' + message + '</div>')
172-
}
173-
$('.distributiongrouplink_whom').click(function () {
174-
var element = $(event.target);
175-
var tagId = element.attr('data-itemid') + ', ' + element.attr('data-rolename');
176-
$('input[data-role=tagsinputGroup2]').tagsinput('add', { value: tagId, text: element.text() });
177-
});
178-
179-
$('#rejectCZ').click(function (event) {
180-
var comment = $('#RejectComment').val();
181-
if (comment == "") {
182-
bootstrap_alert.warning('Необходимо заполнить причину отмены');
183-
event.preventDefault();
184-
return false;
185-
}
186-
});
187-
});
188-
</script>

0 commit comments

Comments
 (0)