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

@@ -195,14 +195,12 @@
 				// 拉取加载列表和数据源 
 				await Promise.all([
 					this.FETCH_DATASOURCE('teacheruserdata').then(result => {
-						// console.log(result.data)
 						this.dataSource.ApplyUser = result.data.map(t => ({
 							text: t.f_realname,
 							value: t.f_userid
 						}));
 					}),
 					this.FETCH_DATASOURCE('classdata').then(result => {
-						// console.log(result.data)
 						this.dataSource.ApplyDept = result.data.map(t => ({
 							text: t.name,
 							value: t.id

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue

@@ -47,6 +47,10 @@
 				<l-input v-model="item.Amount" title="金额（元）" disabled placeholder="请填写" right />
 				<view v-if="edit||create" class="welDel" @click="del('FundsApplyDetails', i)"><text
 						class="text-xxl cuIcon cuIcon-move"></text></view>
+						
+				<view  v-if="edit||create" class="welAdd" @click="add('FundsApplyDetails')">
+					<text class="text-xxl cuIcon cuIcon-add"></text>
+				</view>		
 			</view>
 		</view>
 		
@@ -231,7 +235,6 @@
 					//   this.dataSource.FundsApply.CheckStatus = result.data.map(t => ({ text: t.name, value: t.id }))
 					// }),
 				])
-				// console.log(this.dataSource.FundsApply.ApplyUser)
 				await this.fetchForm()
 
 				this.ready = true
@@ -242,8 +245,6 @@
 			async fetchForm() {
 				if (this.mode === 'create') {
 					const result = await this.HTTP_GET('/learun/adms/FundsApply/getEnCode')
-					// console.log(result.EnCode)
-					// this.EnCode = result.EnCode
 					const source = {
 						ApplyDept: this.user.departmentId,
 						ApplyUser: this.user.userId,
@@ -284,7 +285,6 @@
 						break
 
 					case 'save':
-						console.log(this.current, this.FundsApplyDetail)
 						
 						const verifyResult = this.verifyForm()
 						if (verifyResult.length > 0) {
@@ -383,16 +383,10 @@
 			add(str) {
 				let jsons = this.COPY(this[str]);
 				this.FundsApplyDetail.push(jsons)
-				console.log(this.FundsApplyDetail)
-				// let jsons = this.COPY(this[str]);
-				// this.queryData[str].push(jsons)
-				// console.log(this.queryData[str])
 			},
 			del(str, num) {
-				console.log(str)
 				let _this = this
 				this.FundsApplyDetail.splice(num, 1)
-				console.log(this.FundsApplyDetail)
 				let Amounts = _this.FundsApplyDetail.map(item => {
 					return item.Amount
 				})
@@ -401,7 +395,6 @@
 				_this.current.FundsApply.UpperAmount = _this.smalltoBIG(_this.current.FundsApply.SumAmount)
 			},
 			blurChange(item){
-				console.log(item)
 				let _this = this
 				item.Price  = Number(item.Price).toFixed(2)
 				if (item.Number && item.Price) {
@@ -412,11 +405,9 @@
 					})
 					_this.current.FundsApply.SumAmount = Number(_this.sum(Amounts)).toFixed(2)
 					_this.current.FundsApply.UpperAmount = _this.smalltoBIG(_this.current.FundsApply.SumAmount)
-					// console.log(_this.smalltoBIG(_this.current.FundsApply.SumAmount))
 				}
 			},
 			SumAmountChange(item) {
-				console.log(item)
 				let _this = this
 				if (item.Number && item.Price) {
 					
@@ -427,7 +418,6 @@
 					})
 					_this.current.FundsApply.SumAmount = Number(_this.sum(Amounts)).toFixed(2)
 					_this.current.FundsApply.UpperAmount = _this.smalltoBIG(_this.current.FundsApply.SumAmount)
-					// console.log(_this.smalltoBIG(_this.current.FundsApply.SumAmount))
 				}
 
 			},
@@ -499,7 +489,6 @@
 
 		created() {
 			this.user = this.GET_GLOBAL('loginUser');
-			console.log(this.user)
 		}
 	}
 </script>
@@ -555,7 +544,23 @@
 		border: 1px solid #efefef;
 		border-radius: 50%;
 	}
-
+	
+	.welAdd{
+		border-radius: 50%;
+		position: absolute;
+		top: 4px;
+		right: 0px;
+		background: #fff;
+	}
+	.welAdd text {
+		text-align: center;
+		width: 26px;
+		height: 26px;
+		display: block;
+		line-height: 24px;
+		border: 1px solid #efefef;
+		border-radius: 50%;
+	}
 	.welImgAdd {
 		text-align: center;
 		line-height: 0;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue

@@ -40,19 +40,20 @@
           class="sign-canvas"
         ></canvas>
       </view>
+	  <view class="sign-action padding-bottom text-right">
+	    <l-button @click="clearSign" color="red" style="margin-right: 15px;">清空签名板</l-button>
+	  </view>
+	   <view class="cu-form-group"><view class="title">签章：</view></view>
+	  <view v-if="" class="Signwrap">
+	  	<image style="width: 50px;height: 50px;margin: 15px;" :src="Signimg"></image>
+	  </view>
       <view class="sign-action padding-bottom text-right">
 		<!-- <l-button @click="Signature" color="" style="color: #FFFFFF; background: #0081ff; margin-right: 15px;">签章</l-button> -->
 		<picker class="cu-btn df" style="background-color: #0081ff;color: #ffffff;margin-right: 15px;border-radius: 5px;"  @change="Signature" :range="Signaitem" range-key="F_StampName">个人签章</picker>
 		<picker v-if="ComStatus" class="cu-btn df" style="background-color: #fe955c;color: #ffffff;margin-right: 15px;border-radius: 5px;"  @change="Commonture" :range="Commonseal" range-key="F_StampName">学校签章</picker>
-        <l-button @click="clearSign" color="red" style="margin-right: 15px;">清空签名板</l-button>
+        <l-button @click="clearcom" color="red" style="margin-right: 15px;">清空签章</l-button>
       </view>
     </template>
-	
-	<!-- <view>
-		<image style="width: 100px;height: 100px;" :src="Signimg"></image>
-	</view> -->
-	
-	
     <l-textarea v-model="remark" :placeholder="`输入${typeText}意见`" title="审核意见：" required />
 	
 	<!-- 弹层 -->
@@ -133,7 +134,9 @@ export default {
 	  password:'',
 	  PitchonSign:'',
 	  canvasW:'',
-	  canvasH:''
+	  canvasH:'',
+	  signshow:false,
+	  ConfirmSign:''
     }
   },
 
@@ -141,14 +144,12 @@ export default {
     await this.init()
 	// this.Signimg = this.API + `/learun/adms/user/img?data=${'System'}`
 	// this.Signimg = this.API + `/learun/adms/StampPersonal/img?data=${'47201f98-7611-4052-b271-bb99bd7b1d3c'}`
-	// console.log(this.Signimg)
   },
 
   methods: {
     // 页面初始化
     async init() {
       this.taskParam = this.GET_PARAM()
-	  console.log(this.taskParam)
       this.type = this.taskParam.type
       this.typeText = this.taskParam.type === 'sign' ? '加签' : '审核'
 	  await this.getComstatus()
@@ -164,7 +165,6 @@ export default {
 	getSigna(){
 		return this.HTTP_GET("learun/adms/StampPersonal/list",{},"加载数据时出错").then(async res=>{
 			if(res){
-				console.log(res)
 				this.Signaitem = res
 			}
 		})
@@ -174,7 +174,6 @@ export default {
 	getComstatus(){
 		return this.HTTP_GET("learun/adms/StampPersonal/ishaveright",{},"加载数据时出错").then(async res=>{
 			if(res){
-				console.log(res)
 				this.ComStatus = res.result
 			}
 		})
@@ -184,7 +183,6 @@ export default {
 	getCommonseal(){
 		return this.HTTP_GET("learun/adms/StampPersonal/schoollist",{},"加载数据时出错").then(async res=>{
 			if(res){
-				console.log(res)
 				this.Commonseal = res
 			}
 		})
@@ -218,26 +216,19 @@ export default {
 	cancelpswd(){
 		this.passshow = false
 		this.password = ''
-		// this.pitchon = ''
-		// this.PitchonSign = ''
 	},
 	// 确认
 	confirmpswd(){
-		console.log(this.pitchon)
 		let _this = this
 		this.HTTP_POST('learun/adms/StampPersonal/equalPassword', {
 			F_StampId:this.pitchon.F_StampId,
 			F_Password: this.MD5(this.password)
 		}).then(async res=>{
 			if(res.result){
-				console.log(res)
-				console.log(_this.pitchon.F_StampId)
+				_this.ConfirmSign = _this.PitchonSign
 				let imgurl = _this.API + `/learun/adms/StampPersonal/img?data=${_this.pitchon.F_StampId}`
-				// console.log(imgurl)
-				 context.clearRect(250,150,100,100)
-				// _this.clearSign()
-				_this.SignaApply(imgurl)
 				_this.Signimg = imgurl
+				_this.signshow = true
 				_this.passshow = false
 				_this.password = ''
 				_this.pitchon = ''
@@ -254,7 +245,6 @@ export default {
 		uni.getImageInfo({
 			src:goodsImg,
 			success:function(image){
-				// console.log(image)
 				_this.canvasW = image.width / 5;//因为需要所以缩放了8倍
 				_this.canvasH = image.height / 5;
 			}
@@ -284,7 +274,6 @@ export default {
 		this.submitPostData.auditors = JSON.stringify({[this.reviewerListId]:this.reviewer.toString()})
 		delete this.submitPostData.formreq
 		// this.submitPostData.auditors[this.reviewerListId] = this.reviewer
-		console.log(this.submitPostData)
 		const success = await this.HTTP_POST(
 		  this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/auditors',
 		  this.submitPostData,
@@ -320,10 +309,9 @@ export default {
         taskId: this.taskParam.taskId,
         des: this.remark,
         formreq: this.taskParam.formreq,
-		stamp: this.PitchonSign
+		stamp: this.ConfirmSign
       }
 	  
-	  console.log(postData)
 	
       if (this.type === 'sign') {
         postData.userId = this.staff
@@ -397,7 +385,6 @@ export default {
 	  	// }
 		
 		if(Object.keys(userList).length==0){
-			console.log('为空')
 			const success = await this.HTTP_POST(
 			  this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit',
 			  postData,
@@ -464,7 +451,7 @@ export default {
     signEnd(e) {
       touchs = []
     },
-
+	
     // 手写板事件（绘出线型）
     drawLine() {
       if (touchs.length < 2) {
@@ -498,7 +485,11 @@ export default {
         this.canvasInit()
       })
       // #endif
-    }
+    },
+	clearcom(){
+		this.Signimg = ''
+		this.ConfirmSign = ''
+	}
   }
 }
 </script>
@@ -605,4 +596,10 @@ export default {
 	
 }
 
+.Signwrap{
+	margin: 11px;
+	border: 1px dashed #444444;
+	background: #ffffff;
+}
+
 </style>