From 9752269f44d7c1214318a707c928db19176780d7 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 26 Jul 2021 17:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=B0=83=E6=8B=A8=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ass_Acceptance/Form.cshtml               |  2 +-
 .../Views/Ass_Acceptance/Print.cshtml              | 14 ++++++++++----
 .../Views/Ass_AssetsOutApply/AssetsFormView.cshtml |  9 +++++++--
 .../Views/Ass_AssetsOutApply/AssetsFormView.js     | 13 +++++++++++++
 .../Views/Ass_AssetsOutApply/AssetsIndex.js        |  2 +-
 .../Views/Ass_AssetsOutApply/Form.cshtml           |  2 +-
 .../Views/Ass_AssetsOutApply/Print.cshtml          |  5 +++--
 7 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.cshtml
index 57f965cfe..6e4f3367d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/Form.cshtml	
@@ -32,7 +32,7 @@
         <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
         <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
         <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
-        <input id="detailprint" type="button" class="btn btn-success" value="打印明细" />
+        @*<input id="detailprint" type="button" class="btn btn-success" value="打印明细" />*@
     </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="Ass_Acceptance"></div>
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 d002cbb55..7df2cca81 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	
@@ -72,7 +72,7 @@
                     if (tempdatra[i].AAIStock != 'undefined') {
                         num += tempdatra[i].AAIStock;
                     }
-                    
+
                     pricenum += tempdatra[i].AAIPrice * tempdatra[i].AAIStock;
                     //单位
                     var AAIUnit = '';
@@ -92,7 +92,9 @@
                         key: tempdatra[i].AAIUseDeptId,
                         keyId: 'id',
                         callback: function (_data) {
-                            AAIUseDeptName = _data['name'];
+                            if (_data['name'] && _data['name'] != 'undefined') {
+                                AAIUseDeptName = _data['name'];
+                            }
                         }
                     });
                     //放置地点
@@ -102,7 +104,9 @@
                         key: tempdatra[i].AAIStorageId,
                         keyId: 'sid',
                         callback: function (_data) {
-                            AAIStorage += _data['sname'];
+                            if (_data['sname'] && _data['sname'] != 'undefined') {
+                                AAIStorage += _data['sname'];
+                            }
                         }
                     });
                     top.learun.clientdata.getAsync('custmerData', {
@@ -110,7 +114,9 @@
                         key: tempdatra[i].AAIStoragePosition,
                         keyId: 'rid',
                         callback: function (_data) {
-                            AAIStorage += _data['rname'];
+                            if (_data['rname'] && _data['rname'] != 'undefined') {
+                                AAIStorage += _data['rname'];
+                            }
                         }
                     });
                     //使用人
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.cshtml
index 57f282db0..d07637903 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.cshtml	
@@ -8,7 +8,7 @@
 <div class="lr-form-wrap">
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsOutApply">
         <div class="lr-form-item-title">调拨单流水号</div>
-        <input id="AOCode" type="text" class="form-control"  />
+        <input id="AOCode" type="text" class="form-control" />
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsOutApply">
             <div class="lr-form-item-title">出库总价</div>
@@ -55,7 +55,12 @@
         <div class="lr-form-item-title">项目名称</div>
         <input id="AOProjectName" type="text" class="form-control" />
     </div>
-   
+
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">明细操作</div>
+        <input id="detailprint" type="button" class="btn btn-success" value="打印明细" />
+
+    </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="Ass_AssetsOutItemApply"></div>
     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js
index 3420830b6..86875942d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsFormView.js	
@@ -112,6 +112,19 @@ var bootstrap = function ($, learun) {
             });
             $('#AOStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
 
+
+            //打印
+            $('#detailprint').on('click', function () {
+                learun.layerForm({
+                    id: 'print',
+                    title: '固定资产调拨单',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/Print',
+                    width: 1100,
+                    height: 800,
+                    btn: null
+                });
+            });
+
             $('#Ass_AssetsOutItemApply').jfGrid({
                 headData: [
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsIndex.js
index 7389b9711..5dc1c07e9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/AssetsIndex.js	
@@ -109,7 +109,7 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('AOId');
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
-                        id: 'formAss_AssetsInfoApply',
+                        id: 'formAss_AssetsOutApply',
                         title: '查看调拨申请',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsOutApply/AssetsFormView?keyValue=' + keyValue,
                         width: 1000,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.cshtml
index 7fad7456f..8dd6af57d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Form.cshtml	
@@ -44,7 +44,7 @@
         <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
         <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
         <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
-        <input id="detailprint" type="button" class="btn btn-success" value="打印明细" />
+        @*<input id="detailprint" type="button" class="btn btn-success" value="打印明细" />*@
         
     </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml
index 990186673..e6bf55b85 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Print.cshtml	
@@ -66,6 +66,7 @@
 
         $(function () {
             var tempdatra = top["layer_formAss_AssetsOutApply"].tempdatra;
+            //console.log(tempdatra);
             if (tempdatra) {
                 var html = '';
                 var num = 0, pricenum = 0;
@@ -83,7 +84,7 @@
                         key: tempdatra[i].AOIOldDepartment,
                         keyId: 'id',
                         callback: function (_data) {
-                            if (_data['sname'] && _data['sname'] != 'undefined') {
+                            if (_data['name'] && _data['name'] != 'undefined') {
                                 AOIOldDepartment = _data['name'];
                             }
                         }
@@ -119,7 +120,7 @@
                         key: tempdatra[i].AOINewDepartment,
                         keyId: 'id',
                         callback: function (_data) {
-                            if (_data['sname'] && _data['sname'] != 'undefined') {
+                            if (_data['name'] && _data['name'] != 'undefined') {
                                 AOINewDepartment = _data['name'];
                             }
                         }