From fb2f8c4b2529ecb5ab8d1aeaa94ee462d3b5e4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Fri, 16 Sep 2022 12:31:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=88=91=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=A7=92=E6=A0=87=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E5=9B=9E=E6=98=BE=E4=BF=AE=E6=94=B9=E4=B8=BAiframe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue | 6 ++---- Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue index cdfc9ef60..3508205d4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue @@ -21,10 +21,8 @@ - - - - + + - + {{CornerMarker}} From 8117fdb3776af01c74d3720045ba13a9e2c21095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Fri, 16 Sep 2022 14:31:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?app2.0=20=E8=A7=A3=E5=86=B3=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages/nworkflow/workflow.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js index d53429cf3..0b6531b31 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js +++ b/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] } } From 2b8f32068529ca6cac54f0c4cf0c6709032abce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= Date: Fri, 16 Sep 2022 15:06:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?app2.0=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=9B=BE=E7=89=87=E5=9B=9E=E6=98=BE=E4=B8=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=B9=E5=8A=A8=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/LR_OAModule/noticeExamine.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue index 3508205d4..43b398353 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue @@ -13,7 +13,7 @@ @@ -61,7 +61,8 @@ export default { content: '', time: '', - date: '' + date: '', + fileList:[], } }, @@ -94,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 }