From 7497bfb3c8462bf4f08e8ef72ef05ca88d5f2636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 25 Mar 2024 17:51:06 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processNodeInformation/index.vue | 35 ++++++++++++++----- .../pages/processDetail/index.vue | 31 ++++++++++++---- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue index ab3f8ffce..16bed6d80 100644 --- a/src/components/processNodeInformation/index.vue +++ b/src/components/processNodeInformation/index.vue @@ -17,7 +17,14 @@ :style="backdrop(item.taskStatus)" :class="{'flow-group-process-content-dis':!leftArrow(index + 1)}">
- {{item.taskKeyName}} + +
+ {{item.taskKeyName}} +
+
+ {{item.taskKeyName}} +
+
@@ -30,7 +37,7 @@ v-if="item.userNames && item.userNames.length > 0">
-
{{val}}
+
{{val}}
@@ -529,21 +536,31 @@ .flow-group-process-content-top { width: 100%; - height: 40px; - line-height: 40px; + margin-top: 10px; + margin-bottom: 10px; font-size: 12px; + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; /* 超出几行省略 */ + overflow: hidden; } .flow-group-process-content-bottom { width: 100%; font-size: 12px; line-height: 1.4; - word-break: break-all; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; /* 超出几行省略 */ + height: 54px; overflow: hidden; + .flow-group-process-content-bottom-text{ + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; /* 超出几行省略 */ + overflow: hidden; + } } .flow-group-process-arrow-dis { diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 103c9e93d..0b0a9f316 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -24,7 +24,14 @@ :style="backdrop(item.taskStatus)" :class="{'flow-group-process-content-dis':!leftArrow(index + 1)}">
- {{item.taskKeyName}} + +
+ {{item.taskKeyName}} +
+
+ {{item.taskKeyName}} +
+
@@ -37,7 +44,7 @@ v-if="item.userNames && item.userNames.length > 0">
-
{{val}}
+
{{val}}
@@ -1828,18 +1835,28 @@ height: 40px; line-height: 40px; font-size: 12px; + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; /* 超出几行省略 */ + overflow: hidden; } .flow-group-process-content-bottom { width: 100%; font-size: 12px; line-height: 1.4; - word-break: break-all; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; /* 超出几行省略 */ + height: 54px; overflow: hidden; + .flow-group-process-content-bottom-text{ + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; /* 超出几行省略 */ + overflow: hidden; + } } .flow-group-process-arrow-dis { From d4dbe598d9f87d9fca9a804e49c75fe8fd9660aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 25 Mar 2024 18:05:53 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/processNodeInformation/index.vue | 4 ++-- src/pages/processCenter/pages/processDetail/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue index 16bed6d80..ffdc5e72a 100644 --- a/src/components/processNodeInformation/index.vue +++ b/src/components/processNodeInformation/index.vue @@ -422,7 +422,7 @@ line-height: 40px; font-weight: 600; float: inline-start; - margin-top: 18px; + margin-top: 28px; } .flow-group-process-end { @@ -437,7 +437,7 @@ line-height: 40px; font-weight: 600; float: inline-end; - margin-top: 20px; + margin-top: 28px; } .flow-group-process-end-left { diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0b0a9f316..8dd8709f5 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -1718,7 +1718,7 @@ line-height: 40px; font-weight: 600; float: inline-start; - margin-top: 18px; + margin-top: 28px; } .flow-group-process-end { @@ -1733,7 +1733,7 @@ line-height: 40px; font-weight: 600; float: inline-end; - margin-top: 20px; + margin-top: 28px; } .flow-group-process-end-left { From de665670943ba33bc414b77b743bb8d91b94d304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 25 Mar 2024 18:07:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8E=86=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/processDetail/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 8dd8709f5..15d471c31 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -1832,8 +1832,8 @@ .flow-group-process-content-top { width: 100%; - height: 40px; - line-height: 40px; + margin-top: 10px; + margin-bottom: 10px; font-size: 12px; word-break: break-all; text-overflow: ellipsis; From 5c6853166d05dca02d20d03bc7d0416b2d16a4cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 26 Mar 2024 09:57:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbrk/common/formEditList.vue | 42 ++++++++-------- .../qbrk/common/formEditListFb.vue | 48 +++++++++---------- .../creatProcess/qbrk/common/formList-1.vue | 36 +++++++------- .../creatProcess/qbrk/common/formList.vue | 42 ++++++++-------- .../creatProcess/qbrk/common/formListIn.vue | 30 ++++++------ .../pages/creatProcess/qbrk/step1-2.vue | 6 +-- .../pages/creatProcess/qbrk/step1.vue | 6 +-- 7 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index ac4580933..4ec906e85 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -186,9 +186,9 @@
{{ item.name }} - - - + + +
@@ -220,9 +220,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -256,9 +256,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -290,9 +290,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -577,9 +577,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -745,9 +745,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -775,9 +775,9 @@ class="fileClass" > {{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 089ebaa01..ad010ad0a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -184,9 +184,9 @@ @click="handleFilePreviewOne(item,'onlineEdit')" /> - - - + + +
@@ -203,9 +203,9 @@ > {{ item.name }} - - - + + +
@@ -232,9 +232,9 @@
{{ item.name }} - - - + + +
@@ -263,9 +263,9 @@
{{ item.name }} - - - + + +
@@ -292,9 +292,9 @@
{{ item.name }} - - - + + +
@@ -547,9 +547,9 @@
{{ item.name }} - - - + + +
@@ -715,9 +715,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -740,9 +740,9 @@
{{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue index 4007264a7..97cc2180d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue @@ -104,9 +104,9 @@
{{ item.name }} - - - + + +
@@ -116,9 +116,9 @@
{{ item.name }} - - - + + +
@@ -130,9 +130,9 @@
{{ item.name }} - - - + + +
@@ -142,9 +142,9 @@
{{ item.name }} - - - + + +
@@ -288,9 +288,9 @@
{{ item.name }} - - - + + +
@@ -436,9 +436,9 @@
{{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 9a13ccbe3..7d7077cd6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -146,9 +146,9 @@ @click="handleFilePreviewOne(item,'onlineEdit')" /> - - - + + +
@@ -161,9 +161,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -181,9 +181,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -201,9 +201,9 @@ class="fileClass" > {{ item.name }} - - - + + + @@ -219,9 +219,9 @@ class="fileClass" > {{ item.name }} - - - + + + @@ -421,9 +421,9 @@ class="fileClass" > {{ item.name }} - - - + + + @@ -583,9 +583,9 @@ class="fileClass" > {{ item.name }} - - - + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue index ec908f63c..2d0e079bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue @@ -115,9 +115,9 @@
{{ item.name }} - - - + + +
@@ -127,9 +127,9 @@
{{ item.name }} - - - + + +
@@ -141,9 +141,9 @@
{{ item.name }} - - - + + +
@@ -153,9 +153,9 @@
{{ item.name }} - - - + + +
@@ -298,9 +298,9 @@
{{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 90be08908..fb7c782fd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -172,9 +172,9 @@ class="fileClass" > {{ item.name }} - - - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index f54da1092..760060c06 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -256,9 +256,9 @@ @click="handleFilePreview(item)" > {{ item.name }} - - - + + +
From e6736363e84b9cd16dc88f386e9fe0a6a0c2ecd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 26 Mar 2024 11:51:33 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbrk/common/formEditList.vue | 57 +++++++++++++++---- .../qbrk/common/formEditListFb.vue | 28 ++++++++- .../creatProcess/qbrk/common/formList.vue | 56 ++++++++++++++---- .../pages/creatProcess/qbrk/step1-2.vue | 18 ++++++ .../pages/creatProcess/qbrk/step1.vue | 21 ++++++- 5 files changed, 155 insertions(+), 25 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 4ec906e85..993b41a38 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -212,19 +212,37 @@ clearable />
-
-
- {{ item.name }} - - - +
+
+ {{ item.name }} + + + + + + +
-
+ +
+
+ {{ item.name }} + + + +
+
+
import { mapGetters } from 'vuex' import ProcessTitle from '../../../components/ProcessTitle' +import { onlyOfficeUrl } from '@/sysConfig' export default { name: 'FormEditList', @@ -1023,6 +1042,20 @@ export default { } }, methods: { + viewOnlyOffice (item) { + const key = new Date().getTime() + let oldFileName = item.name + let index1 = oldFileName.lastIndexOf('.') + let fileSuffix = oldFileName.substring(index1+1, oldFileName.length) + fileSuffix = fileSuffix.toLowerCase() + oldFileName = oldFileName.substring(0, index1) + if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){ + window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix + + '&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName) + }else{ + this.$message.warning('此文件不支持onlyoffice预览') + } + }, filterOp (data) { if (!data) { return '' diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index ad010ad0a..13fe14412 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -229,14 +229,25 @@ clearable />
-
+
{{ item.name }} + + +
+
+
+ {{ item.name }} + + + +
+
import { mapGetters } from 'vuex' +import { onlyOfficeUrl } from '@/sysConfig' import ProcessTitle from '../../../components/ProcessTitle' import CurrentOrder from '@/pages/processCenter/pages/components/CurrentOrder'; @@ -999,6 +1011,20 @@ export default { } }, methods: { + viewOnlyOffice (item) { + const key = new Date().getTime() + let oldFileName = item.name + let index1 = oldFileName.lastIndexOf('.') + let fileSuffix = oldFileName.substring(index1+1, oldFileName.length) + fileSuffix = fileSuffix.toLowerCase() + oldFileName = oldFileName.substring(0, index1) + if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){ + window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix + + '&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName) + }else{ + this.$message.warning('此文件不支持onlyoffice预览') + } + }, queryOrder () { this.$refs.CurrentOrderRef.open(this.form.standSort, this.form.standNum) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 7d7077cd6..ab0ef45f4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -173,17 +173,36 @@ -
- {{ item.name }} - - - +
+
+ {{ item.name }} + + + + + + +
+
+
+
+ {{ item.name }} + + + +
@@ -597,6 +616,7 @@