bjquanjiang
/
DigitalScholl
1
0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

添加 资金评审、结算进度页面

金隅分支
zhangli 3 年之前
父節點
8a2f29c218
當前提交
e01a1f073d
共有 9 個檔案被更改，包括 579 行新增 和 2 行删除
分割檢視
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectManageController.cs
  2. +9
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectProcessManageController.cs
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Form.cshtml
  4. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js
  5. +61
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index1.cshtml
  6. +280
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index1.js
  7. +32
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectProcessManage/IndexData1.cshtml
  8. +181
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectProcessManage/IndexData1.js
  9. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

+ 9
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectManageController.cs 查看文件

@@ -31,6 +31,15 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
return View();
}
/// <summary>
/// 主页面
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult Index1()
{
return View();
}
/// <summary>
/// 表单页
/// <summary>
/// <returns></returns>


+ 9
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ProjectProcessManageController.cs 查看文件

@@ -46,6 +46,15 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
{
return View();
}
/// <summary>
/// 表单页
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult IndexData1()
{
return View();
}
#endregion

#region 获取数据


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Form.cshtml 查看文件

@@ -16,7 +16,7 @@
<input id="Period" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item" data-table="ProjectManage" >
<div class="lr-form-item-title">项目费用</div>
<div class="lr-form-item-title">项目金额</div>
<input id="ItemAmount" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
</div>
<div class="col-xs-12 lr-form-item" data-table="ProjectManage">


+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index.js 查看文件

@@ -151,11 +151,12 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/GetPageList',
headData: [
{ label: "项目名称", name: "Name", width: 200, align: "left" },
{ label: "项目周期", name: "Period", width: 100, align: "left" },
{ label: "项目金额", name: "ItemAmount", width: 100, align: "left" },
{
label: "负责部门", name: "DepartmentId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {


+ 61
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index1.cshtml 查看文件

@@ -0,0 +1,61 @@
@{
/**/

ViewBag.Title = "项目管理";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout lr-layout-left-center" id="lr_layout">
<div class="lr-layout-left">
<div class="lr-layout-wrap">
<div class="lr-layout-title lrlt ">类型</div>
<div id="dataTree" class="lr-layout-body"></div>
</div>
</div>
<div class="lr-layout-center">
<div class="lr-layout-wrap ">
<div class="lr-layout-title">
<span id="titleinfo" class="lrlt">未选择类型</span> - <span class="lrlt">列表信息</span>
</div>
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
<div class="lr-query-formcontent">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">项目名称</div>
<input id="Name" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">负责部门</div>
<div id="DepartmentId"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">负责人</div>
<div id="ManagerId"></div>
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;项目上报</a>
<a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
</div>
<div class=" btn-group btn-group-sm" learun-authorize="yes">
<a id="lr_data" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 设置上传项目资料</a>
<a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 审核</a>
<a id="lr_nosubmit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 去审</a>
<a id="lr_file" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 归档</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ProjectManage/Index1.js")

+ 280
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectManage/Index1.js 查看文件

@@ -0,0 +1,280 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-06-21 15:49
* 描 述：项目管理
*/
var refreshGirdData;
var PTId;
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.inittree();
page.initGird();
page.bind();
},
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
$('#DepartmentId').lrDepartmentSelect();
$('#ManagerId').lrUserSelect(0);
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
// 新增
$('#lr_add').on('click', function () {
if (!PTId) {
learun.alert.warning('请选择类型！');
return false;
}
learun.layerForm({
id: 'form',
title: '新增',
url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/Form?PTId=' + PTId,
width: 800,
height: 600,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
});
// 编辑
$('#lr_edit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != '0') {
return learun.alert.warning('选中项目已审核，不可编辑！');
}
learun.layerForm({
id: 'form',
title: '编辑',
url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/Form?keyValue=' + keyValue,
width: 800,
height: 600,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
// 删除
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != '0') {
return learun.alert.warning('选中项目已审核，不可删除！');
}
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/ProjectManage/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
});
}
});
// 审核
$('#lr_submit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认审核该项！', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/LogisticsManagement/ProjectManage/UpdateStatus', { keyValue: keyValue, Status: 1 }, function () {
refreshGirdData();
});
}
});
}
});
// 去审
$('#lr_nosubmit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认去审该项！', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/LogisticsManagement/ProjectManage/UpdateStatus', { keyValue: keyValue, Status: 0 }, function () {
refreshGirdData();
});
}
});
}
});
// 归档，将状态改为2
$('#lr_file').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认归档该项！', function (res) {
if (res) {
learun.postForm(top.$.rootUrl + '/LogisticsManagement/ProjectManage/UpdateStatus', { keyValue: keyValue, Status: 2 }, function () {
refreshGirdData();
});
}
});
}
});
//设置上传项目资料
$('#lr_data').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != '0') {
return learun.alert.warning('选中项目已审核，不可设置！');
}
learun.layerForm({
id: 'ProjectDataManageIndex',
title: '项目资料管理',
url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/Index?PId=' + keyValue,
width: 1000,
height: 800,
btn: null
});
}
});
},
inittree: function () {
// 初始化左侧树形数据
$('#dataTree').lrtree({
url: top.$.rootUrl + '/LogisticsManagement/ProjectTypeManage/GetTree',
nodeClick: page.treeNodeClick
});
},
treeNodeClick: function (item) {
PTId = item.id;
$('#titleinfo').text(item.text);
page.search();
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/GetPageList',
headData: [
{ label: "项目名称", name: "Name", width: 200, align: "left" },
{ label: "项目周期", name: "Period", width: 100, align: "left" },
{ label: "项目金额", name: "ItemAmount", width: 100, align: "left" },
{
label: "负责部门", name: "DepartmentId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{
label: "负责人", name: "ManagerId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('user', {
key: value,
callback: function (_data) {
callback(_data.name);
}
});
}
},
{
label: "项目状态", name: "Status", width: 100, align: "left",
formatter: function (value) {
if (value == 0) {
return '<span class=\"label label-default\">草稿</span>';
} else if (value == 1) {
return '<span class=\"label label-warning\">进行中</span>';
} else if (value == 2) {
return '<span class=\"label label-success\">已完成</span>';
}
}
},
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'Id',
isPage: true,
sidx: 'CreateTime desc',
isSubGrid: true, // 是否有子表单
subGridExpanded: function (subContentId, rowItem) {
var PId = rowItem.Id;
$('#' + subContentId).jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectPhaseManage/GetList',
headData: [
{ name: "Name", width: 150, align: "left" }
],
mainId: 'Id',
isPage: false,
sidx: 'Sort',
sord: 'ASC',
isSubGrid: true, // 是否有子表单
subGridExpanded: function (subContentId, rowItem) {
$('#' + subContentId).jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectDataManage/GetList',
headData: [
{ label: "项目资料名称", name: "Name", width: 200, align: "left" },
{
label: "负责部门", name: "DepartmentId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{
label: "负责人", name: "ManagerId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('user', {
key: value,
callback: function (_data) {
callback(_data.name);
}
});
}
},
{
label: "是否上传", name: "FileStatus", width: 130, align: "left",
formatter: function (value) {
return value == '1' ? '<span class=\"label label-success\">是</span>' : '<span class=\"label label-warning\">否</span>';
}
},
{ label: "上传时间", name: "FileTime", width: 130, align: "left" },
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'Id',
isPage: false,
});
var param;
param = param || {};
param.PPId = rowItem.Id;
param.PId = PId;
$('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
});
var param;
param = param || {};
//param.BId = rowItem.Id;
$('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
});
page.search();
},
search: function (param) {
param = param || {};
param.PTId = PTId;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 32
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectProcessManage/IndexData1.cshtml 查看文件

@@ -0,0 +1,32 @@
@{
/**/

ViewBag.Title = "项目进展情况管理";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout lr-layout-left-center" id="lr_layout">
<div class="lr-layout-left">
<div class="lr-layout-wrap">
<div class="lr-layout-title lrlt ">类型</div>
<div id="dataTree" class="lr-layout-body"></div>
</div>
</div>
<div class="lr-layout-center">
<div class="lr-layout-wrap ">
<div class="lr-layout-title">
<span id="titleinfo" class="lrlt">未选择类型</span> - <span class="lrlt">列表信息</span>
</div>
<div class="lr-layout-tool">
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ProjectProcessManage/IndexData1.js")

+ 181
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ProjectProcessManage/IndexData1.js 查看文件

@@ -0,0 +1,181 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2021-06-21 15:49
* 描 述：项目管理
*/
var refreshGirdData;
var PTId;
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.inittree();
page.initGird();
page.bind();
},
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
$('#DepartmentId').lrDepartmentSelect();
$('#ManagerId').lrUserSelect(0);
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});

//填写项目进展情况
$('#lr_data').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != 1) {
return learun.alert.warning('只有进行中状态才可填写！');
}
learun.layerForm({
id: 'ProjectDataManageIndex',
title: '项目进展情况管理',
url: top.$.rootUrl + '/LogisticsManagement/ProjectProcessManage/Index?PId=' + keyValue,
width: 1000,
height: 800,
btn: ['确定'],
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
},
inittree: function () {
// 初始化左侧树形数据
$('#dataTree').lrtree({
url: top.$.rootUrl + '/LogisticsManagement/ProjectTypeManage/GetTree',
nodeClick: page.treeNodeClick
});
},
treeNodeClick: function (item) {
PTId = item.id;
$('#titleinfo').text(item.text);
page.search();
},
// 初始化列表
initGird: function () {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectManage/GetPageList',
headData: [
{ label: "项目名称", name: "Name", width: 200, align: "left" },
{ label: "项目周期", name: "Period", width: 100, align: "left" },
{
label: "负责部门", name: "DepartmentId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
key: value,
keyId: 'id',
callback: function (_data) {
callback(_data['name']);
}
});
}
},
{
label: "负责人", name: "ManagerId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('user', {
key: value,
callback: function (_data) {
callback(_data.name);
}
});
}
},
{
label: "项目状态", name: "Status", width: 100, align: "left",
formatter: function (value) {
if (value == 0) {
return '<span class=\"label label-default\">草稿</span>';
} else if (value == 1) {
return '<span class=\"label label-warning\">进行中</span>';
} else if (value == 2) {
return '<span class=\"label label-success\">完成</span>';
}
}
},
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'Id',
isPage: true,
sidx: 'CreateTime desc',
isSubGrid: true, // 是否有子表单
subGridExpanded: function (subContentId, rowItem) {
var PId = rowItem.Id;
$('#' + subContentId).jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectPhaseManage/GetList',
headData: [
{ name: "Name", width: 150, align: "left" }
],
mainId: 'Id',
isPage: false,
sidx: 'Sort',
sord: 'ASC',
isSubGrid: true, // 是否有子表单
subGridExpanded: function (subContentId, rowItem) {
$('#' + subContentId).jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/ProjectProcessManage/GetList',
headData: [
{ label: "项目进展情况", name: "Progress", width: 200, align: "left" },
{
label: "时间", name: "ProcessTime", width: 100, align: "left",
formatter: function (value) {
return learun.formatDate(value, 'yyyy-MM-dd');
}
},
{
label: "创建人", name: "CreateUserId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('user', {
key: value,
callback: function (_data) {
callback(_data.name);
}
});
}
},
{
label: "创建时间", name: "CreateTime", width: 200, align: "left" ,
//formatter: function (value) {
// return learun.formatDate(value, 'yyyy-MM-dd');
//}
}
],
mainId: 'Id',
isPage: false,
});
var param;
param = param || {};
param.PPId = rowItem.Id;
param.PId = PId;
$('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
});
var param;
param = param || {};
//param.BId = rowItem.Id;
$('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
});
page.search();
},
search: function (param) {
param = param || {};
param.PTId = PTId;
//param.SqlParameter = " and [Status]=1";
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj 查看文件

@@ -1221,8 +1221,10 @@
<Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexView.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\Index.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexData.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectManage\Index1.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Form.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectPhaseManage\Index.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData1.js" />
<Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData.js" />
<Content Include="Areas\LR_AuthorizeModule\Views\Authorize\AppForm.js" />
<Content Include="Areas\LR_AuthorizeModule\Views\Authorize\Form.css" />
@@ -7387,6 +7389,8 @@
<Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData.cshtml" />
<Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexView.cshtml" />
<Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\FormView.cshtml" />
<Content Include="Areas\LogisticsManagement\Views\ProjectManage\Index1.cshtml" />
<Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData1.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />


Write Preview
Loading…
取消
儲存