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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.css

@@ -236,13 +236,13 @@
 
 .auditinfo-s {
     position: absolute;
-    top: 0;
-    right: 200px;
-    height: 100px;
+    top: 25px;
+    right: 225px;
+    height: 50px;
 }
 
     .auditinfo-s img {
-        height: 100px;
+        height: 50px;
     }
 
 .auditinfo-sg {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js

@@ -674,6 +674,13 @@ var bootstrap = function ($, learun) {
                         //    }
                         //});
 
+                        //需要填写审批意见时，验证审批意见的必填性
+                        var des = $('#des').val();
+                        if (btnData.isOpinion == '1' && !des) {
+                            learun.alert.warning('请签署审批意见！');
+                            return false;
+                        }
+
                         top.flowAuditfn = function (signUrl, stamp) {
                             // 下个流程是否需要可以手动选择审核人
                             getNextUsers(btnData, nwflow.currentNode, '', nwflow.processId, nwflow.taskId, function (data) {
@@ -702,10 +709,6 @@ var bootstrap = function ($, learun) {
                                             return top[id].acceptClick(function (auditers) {
                                                 // 保存表单数据
                                                 custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () {
-                                                    var des = $('#des').val();
-                                                    if (btnData.isOpinion == '1' && !des) {
-                                                        return learun.alert.warning('请签署审批意见！');
-                                                    }
                                                     // 审批流程
                                                     learun.loading(true, '审批流程...');
                                                     var postData = {
@@ -734,11 +737,6 @@ var bootstrap = function ($, learun) {
                                     // 保存表单数据
                                     custmerForm.save(nwflow.processId, nwflow.currentNode.wfForms, function () {
                                         // 审批流程
-                                        var des = $('#des').val();
-                                        if (btnData.isOpinion == '1' && !des) {
-                                            return learun.alert.warning('请签署审批意见！');
-                                        }
-                                        
                                         learun.loading(true, '审批流程...');
                                         var postData = {
                                             operationCode: btnData.code,

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

@@ -1,5 +1,17 @@
 <template>
 	<view class="page">
+		<view>
+			<view class="cu-bar bg-white cu-title solid-bottom">
+				<view class="action" style="vertical-align: middle;">
+					<text class="margin-right-xs text-blue cuIcon-title">
+						<span></span>
+					</text>
+					<text class="text-xl">
+						<span>经费开支申报单</span>
+					</text>
+				</view>
+			</view>
+		</view>
 		<view v-if="ready">
 			<l-input @input="setValue('FundsApply.EnCode', $event)" :value="getValue('FundsApply.EnCode')"
 				title="申报单号" /> <!-- v-if="!edit" :disabled="!edit" -->

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

@@ -1,5 +1,17 @@
 <template>
   <view>
+	  <view>
+	  	<view class="cu-bar bg-white cu-title solid-bottom">
+	  		<view class="action" style="vertical-align: middle;">
+	  			<text class="margin-right-xs text-blue cuIcon-title">
+	  				<span></span>
+	  			</text>
+	  			<text class="text-xl">
+	  				<span>经费开支申报单</span>
+	  			</text>
+	  		</view>
+	  	</view>
+	  </view>
     <l-label title="流程名称：">{{ taskParam.taskName }}</l-label>
     <l-label title="当前操作：">{{ typeText }}{{ type === 'sign' ? '' : ` [${taskParam.name}]` }}</l-label>
     <l-organize-picker
@@ -120,7 +132,8 @@ export default {
 	  passshow:false,
 	  password:'',
 	  PitchonSign:'',
-	  
+	  canvasW:'',
+	  canvasH:''
     }
   },
 
@@ -204,9 +217,9 @@ export default {
 	//  取消
 	cancelpswd(){
 		this.passshow = false
-		this.password = ''
-		this.pitchon = ''
-		this.PitchonSign = ''
+		// this.password = ''
+		// this.pitchon = ''
+		// this.PitchonSign = ''
 	},
 	// 确认
 	confirmpswd(){
@@ -221,6 +234,7 @@ export default {
 				console.log(_this.pitchon.F_StampId)
 				let imgurl = _this.API + `/learun/adms/StampPersonal/img?data=${_this.pitchon.F_StampId}`
 				console.log(imgurl)
+				// _this.clearSign()
 				_this.SignaApply(imgurl)
 				_this.Signimg = imgurl
 				_this.passshow = false
@@ -235,15 +249,19 @@ export default {
 	},
 	// 绘制签章图片到canvas
 	SignaApply(goodsImg){
+		let _this = this
 		uni.getImageInfo({
 			src:goodsImg,
 			success:function(image){
 				// console.log(image)
+				_this.canvasW = image.width / 5;//因为需要所以缩放了8倍
+				_this.canvasH = image.height / 5;
 			}
 		})
 		
 		setTimeout(()=>{
-		  context.drawImage(goodsImg,200,180,150,80)
+		  console.log(_this.canvasW)
+		  context.drawImage(goodsImg,250,150,100,100)
 		  context.draw(true,(res)=>{
 				  // console.log(res)
 		  })