From 3a0870215dc84f90a078833ff8ce98a4cd25ce6c Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Thu, 8 Dec 2022 17:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=80=BB=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=A4=87=E6=B3=A8=E6=94=B9=E4=B8=BA=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BA=BA=EF=BC=8C=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E5=A4=87=E6=B3=A8=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetManagementSystem/FundsApply/list.vue     | 12 ++++++++++--
 .../AssetManagementSystem/FundsApply/single.vue   | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue
index 96f4f6441..ab2938511 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue	
@@ -31,14 +31,19 @@
 							{{ displayListItem(item, 'ApplyUser') }}
 						</view>
 
-						<view class="customlist-item-field">
+						<!-- <view class="customlist-item-field">
 							<text class="customlist-item-field-title">备注：</text>
 							{{ displayListItem(item, 'Remark') }}
+						</view> -->
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">申请人：</text>
+							{{ displayListItem(item, 'Remark') }}
 						</view>
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">总金额：</text>
-							{{ displayListItem(item, 'SumAmount') }}
+							{{ decimals(displayListItem(item, 'SumAmount')) }}
 						</view>
 
 						<view class="customlist-item-field">
@@ -381,6 +386,9 @@
 				} else {
 					return '作废';
 				}
+			},
+			decimals(data){
+				return Number(data).toFixed(2)
 			}
 
 		},
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue
index dd2452aa7..a677f92e7 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue	
@@ -25,9 +25,10 @@
 			<l-select @input="setValue('FundsApply.IsFixedAssets', $event)"
 				:value="getValue('FundsApply.IsFixedAssets')" :range="dataSource.FundsApply.IsFixedAssets"
 				title="是否固定资产" :disabled="!edit" /> <!-- v-if="!edit" -->
-			<l-textarea @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')" title="备注"
-				:readonly="!edit" /> <!-- v-if="!edit" :readonly="!edit" -->
-			
+			<!-- <l-textarea @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')" title="备注"
+				:readonly="!edit" /> --> <!-- v-if="!edit" :readonly="!edit" -->
+			<l-input @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')"
+				title="申请人" :disabled="!edit" />
 			<l-input @input="Statusitem(setValue('FundsApply.Status', $event)) "
 				:value="Statusitem(getValue('FundsApply.Status'))" title="审批状态" disabled v-if="!edit" />
 			<!--  :disabled="!edit" -->
@@ -156,9 +157,13 @@
 							dataSourceId: 'IsFixedAssets',
 							verify: 'NotNull'
 						},
+						// Remark: {
+						// 	type: 'texteditor',
+						// 	title: '备注',
+						// },
 						Remark: {
-							type: 'texteditor',
-							title: '备注',
+							type: 'text',
+							title: '申请人',
 						},
 						SumAmount: {
 							type: 'text',