From 9ff7ab07744e6b3bf9362bd41b734ca68cf1076c Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 13 May 2021 14:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E5=85=B6?=
=?UTF-8?q?=E4=BB=96=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9=E6=A5=BC=E5=AE=87?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E6=88=BF=E9=97=B4=E5=8F=B7=20?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E8=A1=A8?=
=?UTF-8?q?=E5=8A=A0=E6=97=A7=E6=88=BF=E9=97=B4=E5=8F=B7=E3=80=81=E6=96=B0?=
=?UTF-8?q?=E6=88=BF=E9=97=B4=E5=8F=B7=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/AssScrap/Form.cshtml | 2 +-
.../Views/AssScrap/Form.js | 2 +-
.../Views/AssScrap/Index.js | 2 +-
.../Views/Ass_AssetsInfo/Index.js | 14 +-
.../Views/Ass_AssetsInfoItem/IndexTwo.js | 105 +-
.../Views/Ass_AssetsInfoItemApply/Form.cshtml | 2 +-
.../Views/Ass_AssetsInfoItemApply/Form.js | 7 +-
.../Views/Ass_AssetsOutApply/Form.js | 30 +-
.../Views/Ass_AssetsOutApply/FormView.js | 30 +-
.../Views/Ass_AssetsOutItemApply/Form.cshtml | 158 +-
.../Views/Ass_AssetsOutItemApply/Form.js | 49 +-
.../Views/Ass_Inventory/Form.js | 2 +-
.../Views/Ass_Inventory/Index.js | 4 +-
.../Ass_AssetsInfo/Ass_AssetsInfoEntity.cs | 30 +-
.../Ass_AssetsOutItemApplyEntity.cs | 12 +-
.../DBModel/资产系统.PDM | 7279 +++++++++--------
16 files changed, 4028 insertions(+), 3700 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.cshtml
index 0df85dd23..51d13b837 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.cshtml
@@ -21,7 +21,7 @@
-
+ @**@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
index 9727cc200..714b1e5ad 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Form.js
@@ -125,7 +125,7 @@ var bootstrap = function ($, learun) {
isMultiple: true
});
$("#detailedit").on('click', function () {
- Ass_ScrapItem
+ //Ass_ScrapItem
var keyValue = $('#Ass_ScrapItem').jfGridValue('AAIId');
selectedRow = $('#Ass_ScrapItem').jfGridGet('rowdata');
if (learun.checkrow(keyValue)) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js
index 51186146a..2dd0e32e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js
@@ -29,7 +29,7 @@ var bootstrap = function ($, learun) {
title: '新增',
url: top.$.rootUrl + '/AssetManagementSystem/AssScrap/Form',
width: 1000,
- height: 600,
+ height: 700,
callBack: function (id) {
var res = false;
// 验证数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js
index 16506cf1c..cd1273b0d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js
@@ -81,14 +81,16 @@ var bootstrap = function ($, learun) {
});
//整理资产数据
- $("#lr_arrangement").on('click', function () {
+ $("#lr_arrangement").on('click',
+ function() {
- learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/ArrangementAss',
- {}, function (res) {
- refreshGirdData();
- });
+ learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfo/ArrangementAss',
+ {},
+ function(res) {
+ refreshGirdData();
+ });
- })
+ });
// 删除
$('#lr_delete').on('click', function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
index 05d2b03a0..82656b087 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexTwo.js
@@ -68,33 +68,9 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/GetPageList',
headData: [
- { label: "明细编号", name: "AICode", width: 200, align: "left" },
- { label: "金隅编号", name: "AICodeNumJY", width: 200, align: "left" },
- { label: "名称", name: "AIASSName", width: 200, align: "left" },
- {
- label: "部门", name: "AIDepartment", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('department', {
- key: value,
- callback: function (_data) {
- callback(_data.name);
- }
- });
- }
- },
- {
- label: "使用人员", name: "AIUsePeople", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
- key: value,
- keyId: 'f_userid',
- callback: function (_data) {
- callback(_data['f_realname']);
- }
- });
- }
- },
+ //{ label: "明细编号", name: "AICode", width: 200, align: "left" },
+ { label: "序号", name: "AICodeNum", width: 100, align: "left" },
+ { label: "资产编号", name: "AICodeNumJY", width: 200, align: "left" },
{
label: "楼宇名称", name: "AIIStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -122,20 +98,28 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+ label: "房间功能", name: "RFunction", width: 150, align: "left"
+ },
+ {
+ label: "房间面积", name: "RArea", width: 100, align: "left"
},
{
- label: "资产属性", name: "AIAssType", width: 100, align: "left",
+ label: "房间状态", name: "REnabled", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'AssType',
+ code: 'RoomState',
callback: function (_data) {
callback(_data.text);
}
});
}
},
+ { label: "资产名称", name: "AIASSName", width: 200, align: "left" },
+ { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
+ {
+ label: "资产型号", name: "AISpecificationtype", width: 100, align: "left"
+ },
{
label: "计量单位", name: "AIUnits", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -146,22 +130,7 @@ var bootstrap = function ($, learun) {
callback: function (_data) {
callback(_data.text);
}
- })
- }
- },
- { label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
- { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
- {
- label: "资产分类", name: "AIASSClass", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
- key: value,
- keyId: 'atid',
- callback: function (_data) {
- callback(_data['aname']);
- }
- });
+ });
}
},
{
@@ -176,21 +145,51 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "管理部门", name: "AdministrativeDepartment", width: 100, align: "left" },
+ //{
+ // label: "管理部门", name: "AIDepartment", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('department', {
+ // key: value,
+ // callback: function (_data) {
+ // callback(_data.name);
+ // }
+ // });
+ // }
+ //},
{
- label: "增加方式", name: "AIAddType", width: 100, align: "left",
+ label: "使用人", name: "AIUsePeople", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
- code: 'zcly',
+ keyId: 'f_userid',
callback: function (_data) {
- callback(_data.text);
+ callback(_data['f_realname']);
}
});
}
},
- { label: "生产厂家", name: "AIManufacturer", width: 100, align: "left" },
- { label: "资产规格", name: "AISpecification", width: 100, align: "left" },
- { label: "用途", name: "AIUse", width: 100, align: "left" },
+ { label: "存放地点", name: "AIPlace", width: 100, align: "left" },
+ { label: "资产原价值", name: "AIAssValue", width: 100, align: "left" },
+ { label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
+ { label: "备注", name: "AIRemark", width: 100, align: "left" },
+ { label: "折旧方法", name: "DepreciationMethod", width: 100, align: "left" },
+ { label: "折旧状态", name: "DepreciationStatus", width: 100, align: "left" },
+ { label: "折旧年限", name: "UsefulLife", width: 100, align: "left" },
+ { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
+ { label: "已提折旧月数", name: "MonthsOfDepreciation", width: 100, align: "left" },
+ { label: "月折旧率", name: "MonthlyDepreciationRate", width: 100, align: "left" },
+ { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
+ { label: "净值", name: "NetWorth", width: 100, align: "left" },
+ { label: "车辆行驶证所有人", name: "VehicleLicenseUser", width: 100, align: "left" },
+ { label: "车辆识别号", name: "AIVehicleNumber", width: 100, align: "left" },
+ { label: "车牌号", name: "AIPlateNumber", width: 100, align: "left" },
+ { label: "面积", name: "AIBuiltArea", width: 100, align: "left" },
+ { label: "权属证号", name: "AIOwnership", width: 100, align: "left" },
+ { label: "土地使用权类型", name: "LandUseType", width: 100, align: "left" },
+ { label: "土地使用权人/房屋所有权人", name: "LandUseUser", width: 200, align: "left" }
+
],
mainId: 'AIId',
isMultiselect: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
index 6574ec3c4..de35eee04 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.cshtml
@@ -71,7 +71,7 @@
生成明细*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js
index 573c02e53..7f5bcc8ea 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/Form.js
@@ -101,7 +101,7 @@ var bootstrap = function ($, learun) {
$('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
$('#AAIUnit').lrDataItemSelect({ code: 'sldw' });
//$('#AAIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
- $('#AIIStorageId').lrselect({
+ $('#AAIStorageId').lrselect({
type: 'tree',
allowSearch: true,
url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',
@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
if (val) {
storageId = val.value;
}
- $('#AIIStoragePosition').lrselectRefresh({
+ $('#AAIStoragePosition').lrselectRefresh({
url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetListForStorageId?storageId=' + storageId,
text: "RCode",
value: "RId"
@@ -119,7 +119,7 @@ var bootstrap = function ($, learun) {
}
});
//房间
- $('#AIIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
+ $('#AAIStoragePosition').lrselect({ value: 'RId', text: 'RCode' });
$('#AAIHasDetail').lrDataItemSelect({
code: 'YesOrNoBit', select: function (item) {
if (item != null && item != undefined) {
@@ -137,6 +137,7 @@ var bootstrap = function ($, learun) {
if (!!keyValue) {
if (!!selectedRow) {
$('#form').lrSetFormData(selectedRow);
+ $("#AAOldCode").find('span').text(selectedRow.AAIName);
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
index 60e9ff137..3458fab7c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.js
@@ -154,7 +154,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "原库房", name: "AOIStorageId", width: 100, align: "left",
+ label: "原楼宇", name: "AOIStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -166,6 +166,19 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "原房间", name: "AOIRoomId", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: "新使用人", name: "AOINewUsePeople", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -193,7 +206,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "新库房", name: "AOINewStorageId", width: 100, align: "left",
+ label: "新楼宇", name: "AOINewStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -205,6 +218,19 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "新房间", name: "AOINewRoomId", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: '资产型号', name: 'AOIModel', width: 100, align: 'left'
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js
index 7820ea663..2d89fb1e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/FormView.js
@@ -105,7 +105,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "原库房", name: "AOIStorageId", width: 100, align: "left",
+ label: "原楼宇", name: "AOIStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -117,6 +117,19 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "原房间", name: "AOIRoomId", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: "新使用人", name: "AOINewUsePeople", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -144,7 +157,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "新库房", name: "AOINewStorageId", width: 100, align: "left",
+ label: "新楼宇", name: "AOINewStorageId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
@@ -156,6 +169,19 @@ var bootstrap = function ($, learun) {
});
}
},
+ {
+ label: "新房间", name: "AOINewRoomId", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_Storage_Room',
+ key: value,
+ keyId: 'rid',
+ callback: function (_data) {
+ callback(_data['rcode']);
+ }
+ });
+ }
+ },
{
label: '英文名称', name: 'AOIEName', width: 100, align: 'left'
},
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml
index e9dad0351..7b3db2360 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.cshtml
@@ -4,86 +4,94 @@
}
@Html.AppendCssFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.css")
@Html.AppendJsFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.js")
-