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

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue

@@ -13,7 +13,7 @@
 	  <l-input v-model="formData.F_SendPostId" title="接受岗位" disabled></l-input>
 	  <l-select v-model="formData.F_IsSendFX" :range="[{value:true,text:'是'},{value:false,text:'否'}]" title="下发飞星" disabled></l-select>
 	  <l-upload-file
-	    :value="[API + '/learun/adms/annexes/wxdown?' + URL_QUERY(formData.F_NewsImage, true)]"
+	    :value="fileList"
 	    :readonly="true"
 	    title="标题图片"
 	  />
@@ -21,10 +21,8 @@
 	    <!-- @input="setValue('MeetingManagement.Files', $event)" -->
 	  <l-input title="公告内容" disabled style="border-bottom: none;"></l-input>
 	  <view class="padding text-lg" style="background-color: #fff;">
-		  <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
-		  <view v-if="ready" v-html="''">
-		  	
-		  </view>
+		  <!-- <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse> -->
+		  <iframe v-if="ready" style="width: 100%;height: 50vh;" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+formData.F_NewsId" frameborder="0"></iframe>
 	  </view>
 	  <l-workflow-action
 	    @audit="audit"
@@ -63,7 +61,8 @@ export default {
       content: '',
 	  
       time: '',
-      date: ''
+      date: '',
+	  fileList:[],
     }
   },
 
@@ -96,9 +95,13 @@ export default {
     },
 	// 获取表单数据
 	getFormData(ProgressId){
-		return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(res=>{
+		return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(async res=>{
 			if(res){
 				this.formData = res
+				let fileList = await this.getFileListById(res.F_NewsImage)
+				if(fileList&&fileList.length){
+					this.fileList = [fileList[0]]
+				}
 				this.content = res.F_NewsContent
 				this.ready = true
 			}

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue

@@ -50,7 +50,7 @@
 		  style="position: relative;"
         >
           <l-icon :type="item.icon" color="white" class="text-sl" />
-		  <view v-if="item.F_Name == '我的审批'"  class="CornerMarker">
+		  <view v-if="item.F_Name == '我的审批'&&CornerMarker"  class="CornerMarker">
 		  	{{CornerMarker}}
 		  </view>
         </view>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js

@@ -265,15 +265,15 @@ export default {
 					// 不是表格的情况
 					const path = item.__valuePath__
 					const val = get(formValue, path)
-
+					var guid = undefined
 					if (item.type == 'upload') {
 						// 先生成一个guid
-						var guid = this.newguid();
+						guid = this.newguid();
 						// 取出当前列对应的labelId
 						var labeId = item.id
 						// 从缓存取出当前审批流程所有的guid
 						var guids = JSON.parse(uni.getStorageSync('guids'))
-						if (guids&&JSON.stringify(guids)!=='{}') {
+						if (guids&&JSON.stringify(guids)!=='{}'&&guids[labeId]) {
 							guid = guids[labeId]
 						}
 					}