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

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

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