From 217de3e95a070f7d1ea0e7db0dbb6b8b311f6c79 Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Thu, 8 Dec 2022 17:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BB=8F=E8=B4=B9=E5=BC=80?=
 =?UTF-8?q?=E6=94=AF=E9=87=91=E9=A2=9D=E6=B7=BB=E5=8A=A0=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E7=AD=BE=E7=AB=A0=E6=B8=85=E6=A5=9A?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E4=B8=AA=E7=AD=BE=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/AssetManagementSystem/FundsApply/single.vue    | 9 ++++++++-
 .../LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue      | 8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

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 28002e1d0..dd2452aa7 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	
@@ -253,8 +253,15 @@
 
 				} else {
 					const result = await this.HTTP_GET('/learun/adms/FundsApply/form', this.id)
+					result.FundsApply.SumAmount = Number(result.FundsApply.SumAmount).toFixed(2)
 					this.origin = await this.formatFormData(result)
-					this.FundsApplyDetail = result.FundsApplyDetail
+					if(result.FundsApplyDetail.length){
+						for(let i =0;i<result.FundsApplyDetail.length;i++){
+							result.FundsApplyDetail[i].Price = Number(result.FundsApplyDetail[i].Price).toFixed(2)
+							result.FundsApplyDetail[i].Amount = Number(result.FundsApplyDetail[i].Amount).toFixed(2)
+						}
+						this.FundsApplyDetail = result.FundsApplyDetail
+					}
 				}
 				this.current = this.COPY(this.origin)
 			},
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue
index 398401bf3..ab8ad570b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
@@ -217,7 +217,7 @@ export default {
 	//  取消
 	cancelpswd(){
 		this.passshow = false
-		// this.password = ''
+		this.password = ''
 		// this.pitchon = ''
 		// this.PitchonSign = ''
 	},
@@ -233,7 +233,8 @@ export default {
 				console.log(res)
 				console.log(_this.pitchon.F_StampId)
 				let imgurl = _this.API + `/learun/adms/StampPersonal/img?data=${_this.pitchon.F_StampId}`
-				console.log(imgurl)
+				// console.log(imgurl)
+				 context.clearRect(250,150,100,100)
 				// _this.clearSign()
 				_this.SignaApply(imgurl)
 				_this.Signimg = imgurl
@@ -260,10 +261,9 @@ export default {
 		})
 		
 		setTimeout(()=>{
-		  console.log(_this.canvasW)
 		  context.drawImage(goodsImg,250,150,100,100)
 		  context.draw(true,(res)=>{
-				  // console.log(res)
+				  
 		  })
 		})
 	},