From 0bf1c22dcac6ae23050327edfd36c2267b1c9af0 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Mon, 9 Aug 2021 16:36:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=BF=E9=97=B4=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetManagementSystem/Views/Ass_Acceptance/Form.js | 4 ++-- .../Views/Ass_Acceptance/FormView.js | 4 ++-- .../Views/Ass_Acceptance/Print.cshtml | 4 ++-- .../Views/Ass_AssetsInfoApply/FormJY.js | 2 +- .../Views/Ass_AssetsInfoApply/FormJYHC.js | 2 +- .../Views/Ass_AssetsInfoApply/FormViewJY.js | 2 +- .../Views/Ass_AssetsInfoApply/FormViewJYHC.js | 2 +- .../AssetManagementSystem/Views/Ass_Receive/Form.js | 10 +++------- .../Views/Ass_Receive/FormView.js | 8 +------- 9 files changed, 14 insertions(+), 24 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js index 2c86d52c8..3f3afc285 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.js @@ -177,8 +177,8 @@ var bootstrap = function ($, learun) { key: row.AAIStoragePosition, keyId: 'rid', callback: function (_data) { - if (_data['rname'] && _data['rname'] != 'undefined') { - content += _data['rcode'] + '(' + _data['rname'] + ')'; + if (_data['rcode'] && _data['rcode'] != 'undefined') { + content += _data['rcode']; } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js index 49ae18815..b1f1067b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormView.js @@ -159,8 +159,8 @@ var bootstrap = function ($, learun) { key: row.AAIStoragePosition, keyId: 'rid', callback: function (_data) { - if (_data['rname'] && _data['rname'] != 'undefined') { - content += _data['rcode'] + '(' + _data['rname'] + ')'; + if (_data['rcode'] && _data['rcode'] != 'undefined') { + content += _data['rcode']; } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml index ee39784fa..ce4040d11 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Print.cshtml @@ -124,8 +124,8 @@ key: tempdatra[i].AAIStoragePosition, keyId: 'rid', callback: function (_data) { - if (_data['rname'] && _data['rname'] != 'undefined') { - AAIStorage += _data['rname']; + if (_data['rcode'] && _data['rcode'] != 'undefined') { + AAIStorage += _data['rcode']; } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js index e1bd91df2..1ec826da0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js @@ -165,7 +165,7 @@ var bootstrap = function ($, learun) { key: value, keyId: 'rid', callback: function (_data) { - callback(_data['rcode']); + callback(_data['rcode']+"("+_data['rname']+")"); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js index f63f78ba8..1e1685cb0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js @@ -165,7 +165,7 @@ var bootstrap = function ($, learun) { key: value, keyId: 'rid', callback: function (_data) { - callback(_data['rcode']); + callback(_data['rcode']+"("+_data['rname']+")"); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js index 1143f2bef..0ec5f249f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { key: value, keyId: 'rid', callback: function (_data) { - callback(_data['rcode']); + callback(_data['rcode']+"("+_data['rname']+")"); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js index 36e36aeb1..f9f215c04 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js @@ -155,7 +155,7 @@ var bootstrap = function ($, learun) { key: value, keyId: 'rid', callback: function (_data) { - callback(_data['rcode']); + callback(_data['rcode']+"("+_data['rname']+")"); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js index 3809ada8f..ab9309c92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js @@ -106,15 +106,11 @@ var bootstrap = function ($, learun) { }); } }, + //{label: '英文名称', name: 'AAIEName', width: 100, align: 'left'}, { - label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + label: '规格型号', name: 'AAIModel', width: 100, align: 'left' }, - { - label: '资产型号', name: 'AAIModel', width: 100, align: 'left' - }, - { - label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' - } + //{label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'} ], height: 400, mainId: 'RIID', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js index df078b424..c1209e576 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/FormView.js @@ -62,14 +62,8 @@ var bootstrap = function ($, learun) { } }, { - label: '英文名称', name: 'AAIEName', width: 100, align: 'left' + label: '规格型号', name: 'AAIModel', width: 100, align: 'left' }, - { - label: '资产型号', name: 'AAIModel', width: 100, align: 'left' - }, - { - label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left' - } ], height: 400, mainId: 'RIID',