Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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)
 			}
 
 		},

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',