Browse Source

打印修复

娄底高职分支
hwh2023 1 year ago
parent
commit
b501b8eb95
17 changed files with 39 additions and 32 deletions
  1. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/FormView.cshtml
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/FormView.js
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/FormView.cshtml
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/FormView.js
  5. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/FormView.cshtml
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/FormView.js
  7. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/FormView.cshtml
  8. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/FormView.js
  9. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/FormView.cshtml
  10. +9
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/FormView.js
  11. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/FormView.cshtml
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/FormView.js
  13. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml
  14. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js
  15. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.js
  16. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/FormView.cshtml
  17. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/FormView.js

+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/FormView.cshtml View File

@@ -31,13 +31,13 @@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Edu">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
<input id="DepartmentId" type="text" readonly class="form-control currentInfo lr-currentInfo-department" isvalid="yes" checkexpession="NotNull" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" style="display:none"/>*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Edu">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none"/>*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Edu">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/FormView.cshtml View File

@@ -32,12 +32,12 @@
<div class="col-xs-12 lr-form-item" data-table="Purchase_Info">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Info">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Info">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/FormView.cshtml View File

@@ -31,13 +31,13 @@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Logistic">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
<input id="DepartmentId" type="text" readonly class="form-control currentInfo lr-currentInfo-department" isvalid="yes" checkexpession="NotNull" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" style="display:none"/>*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Logistic">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none"/>*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Logistic">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/FormView.cshtml View File

@@ -32,12 +32,12 @@
<div class="col-xs-12 lr-form-item" data-table="Purchase_Other">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Other">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Other">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 4
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/FormView.cshtml View File

@@ -31,13 +31,13 @@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Print">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
<input id="DepartmentId" type="text" disabled readonly class="form-control currentInfo lr-currentInfo-department" isvalid="yes" checkexpession="NotNull" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" style="display:none"/>*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Print">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none"/>*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Print">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 9
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/FormView.js View File

@@ -36,7 +36,7 @@ var bootstrap = function ($, learun) {
// key: userinfo.departmentId,
// callback: function (_data) {
// $('#DepartmentId').val(_data.name);
// $('#DepartmentName')[0].lrvalue = _data.name;
// //$('#DepartmentName')[0].lrvalue = _data.name;
// }
//});
////加载用户
@@ -44,6 +44,13 @@ var bootstrap = function ($, learun) {
//$('#CreatorName')[0].lrvalue = userinfo.realName;
//$('#CreatorId').val(userinfo.realName);

//$('#DepartmentId').lrselect({
// type: 'tree',
// // 是否允许搜索
// allowSearch: true,
// // 访问数据接口地址
// url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
//});

$('#FilePath').lrUploader({ isUpload: false });
$('#Purchase_Print_Details').jfGrid({
@@ -53,7 +60,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/FormView.cshtml View File

@@ -32,12 +32,12 @@
<div class="col-xs-12 lr-form-item" data-table="Purchase_Service">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Service">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Service">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '人数', name: 'Peoplecount', width: 100, align: 'left' },
{ label: '天数', name: 'Days', width: 100, align: 'left' },
{ label: '标准', name: 'Standar', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml View File

@@ -32,12 +32,12 @@
<div class="col-xs-12 lr-form-item" data-table="Purchase_Student">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Student">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Student">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/FormView.cshtml View File

@@ -32,12 +32,12 @@
<div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
<div class="lr-form-item-title">部门<font face="宋体">*</font></div>
<input id="DepartmentId" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" />
<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />
@*<input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" readonly isvalid="yes" checkexpession="NotNull" style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
<div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
<input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />
@*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />*@
</div>
<div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
<div class="lr-form-item-title">总价格<font face="宋体">*</font></div>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/FormView.js View File

@@ -53,7 +53,7 @@ var bootstrap = function ($, learun) {
{ label: '采购数量', name: 'Quantity', width: 100, align: 'left' },
{ label: '单位', name: 'Unit', width: 100, align: 'left' },
{ label: '用途', name: 'UseTo', width: 100, align: 'left' },
{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
//{ label: 'Id', name: 'Id', width: 100, align: 'left', ishide: true },
],
isEdit: false,
height: 400,


Loading…
Cancel
Save