From 90212453058b51b523cad74463b93e16c77297bb Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 29 Nov 2023 17:39:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E5=AE=A1=E6=89=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E8=BE=93=E5=85=A5=E6=A1=86=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/hzwlComponents/ReceiptDescription.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/hzwlComponents/ReceiptDescription.vue b/src/components/hzwlComponents/ReceiptDescription.vue index df93fa29b..0b03e9fb2 100644 --- a/src/components/hzwlComponents/ReceiptDescription.vue +++ b/src/components/hzwlComponents/ReceiptDescription.vue @@ -48,4 +48,7 @@ export default { height: 48px; line-height: 48px; } +/deep/ .el-form-item__content .el-textarea .el-textarea__inner { + width: 100% !important; +} From 90c50a4d0180bc0cd9c86051517f1eb83e628b84 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 29 Nov 2023 17:40:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?-=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1-1.vue | 35 +++++++++------ .../pages/creatProcess/bzrk/step1.vue | 34 ++++++++------ .../pages/creatProcess/bzrk/step2.vue | 36 ++++++++------- .../pages/creatProcess/bzrk/step3.vue | 44 ++++++++++-------- .../pages/creatProcess/bzrk/step4.vue | 45 +++++++++++-------- 5 files changed, 115 insertions(+), 79 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue index d1c79f90b..b378bd3ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue @@ -1057,19 +1057,25 @@ - - -
- - -
-
-
+ + + + + + + + + + + + + +
@@ -1544,6 +1550,8 @@ import CusTomDataPickerGroup from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; + import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' + export default { name: "bzrkStep1-1", @@ -1558,6 +1566,7 @@ ProcessTitle, TreeSelect, TreeSelectNew, + ReceiptDescription, }, data() { const validateQcdw = (rule, value, callback) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 80a7cd6e4..52fd7ba9e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1057,19 +1057,25 @@
- - -
- - -
-
-
+ + + + + + + + + + + + + +
@@ -1544,6 +1550,7 @@ import CusTomDataPickerGroup from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; + import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' export default { name: "bzrkStep1", @@ -1558,6 +1565,7 @@ ProcessTitle, TreeSelect, TreeSelectNew, + ReceiptDescription, }, data() { const validateQcdw = (rule, value, callback) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index ab88e90e5..42000e8b1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -676,23 +676,27 @@
+ -
- - -
- - -
-
-
-
+ + + + + + + + + + + + + + +
@@ -841,6 +845,7 @@ import { changeAssigneeNew, inboundLiaisonDetail, processCreateStand } from "api import TreeSelect from "@/components/treeSelect/treeSelect.vue"; import CusTomDataPickerGroup from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; +import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' export default { name: "bzrkStep2", @@ -1036,6 +1041,7 @@ export default { } }, components: { + ReceiptDescription, CusTomDataPickerGroup, ProcessHeader, ProcessFooter, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 0bd32219d..6e2008298 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -661,27 +661,31 @@
+
-
- - -
- - - - - - -
-
-
-
+ + + + + + + + + + + + + + + + + + +
@@ -826,6 +830,7 @@ import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup' +import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' export default { @@ -1008,6 +1013,7 @@ export default { } }, components: { + ReceiptDescription, CustomDatePickGroup, ProcessHeader, ProcessFooter, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 5b38dbfc7..d1a6e72af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1269,27 +1269,31 @@
+
-
- - -
- - - - - - -
-
-
-
+ + + + + + + + + + + + + + + + + + +
@@ -1592,9 +1596,12 @@ import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import CusTomDataPickerGroup from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup"; import TreeSelectStand from "@/components/treeSelect/treeSelectStand"; +import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' + export default { name: "bzrkStep4", components: { + ReceiptDescription, TreeSelectStand, CusTomDataPickerGroup, TreeSelectModule, From 502a3fc14926669f8b64f31b5c6d6d1b76ea78c8 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 30 Nov 2023 09:53:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bug:=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0=E6=89=93?= =?UTF-8?q?=E5=BC=80=E6=96=B0=E9=A1=B5=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/processCenter/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index df05525c7..9c1e48222 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -969,6 +969,7 @@ export default { prcType: row.prcType } }) + window.open(routeUrl.href, "_blank"); } else if (row.taskInfo === '会签') { routeUrl =this.$router.resolve({ name: 'bzzqyjStep6', From a65b6bd443551618a3557b4d72bb2c8b3395d77b Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 30 Nov 2023 10:20:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E8=B0=83=E7=A0=94?= =?UTF-8?q?-=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step1-1.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step1.vue | 33 ++++++++++------- .../pages/creatProcess/bzdy/step2.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step3.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step4.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step5-1.vue | 35 +++++++++++-------- .../pages/creatProcess/bzdy/step5.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step6.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step7.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step8.vue | 32 ++++++++++------- .../pages/creatProcess/bzdy/step9.vue | 32 ++++++++++------- 11 files changed, 212 insertions(+), 144 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 9ba79cb7e..ccaf2bfde 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -111,21 +111,25 @@ 隐藏基础信息 展开基础信息 +
- - -
- - -
-
-
+ + + + + + + + + + + + +
@@ -268,6 +272,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process' + import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' export default { name: "bzdyStep1-1", @@ -352,6 +357,7 @@ } }, components: { + ReceiptDescription, ProcessHeader, ProcessFooter, ProcessTitle diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 5c0faa4fc..e91520199 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -111,21 +111,26 @@ 隐藏基础信息 展开基础信息 +
- - -
- - -
-
-
+ + + + + + + + + + + + +
@@ -271,6 +276,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { queryTaskFirst, saveTaskFirst } from "api/process"; import { taskDel } from 'api/process' +import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription' export default { name: "bzdyStep1", data() { @@ -357,6 +363,7 @@ export default { } }, components: { + ReceiptDescription, ProcessHeader, ProcessFooter, ProcessTitle diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index e345b01ad..df55a0d93 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -95,21 +95,25 @@ 隐藏基础信息 展开基础信息 +
- - -
- - -
-
-
+ + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
- - - -
- - -
-
-
+ > + + + + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
+ - - -
- - -
-
-
+ + + + + + + + + + + + +
Date: Thu, 30 Nov 2023 10:44:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-=E8=AF=84?= =?UTF-8?q?=E5=88=86=E5=8E=BB=E6=8E=89=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk/step2.vue | 13 ------------- .../processCenter/pages/creatProcess/qbrk/step5.vue | 6 ------ .../processCenter/pages/creatProcess/qbrk/step6.vue | 6 ------ .../processCenter/pages/creatProcess/qbrk/step7.vue | 6 ------ .../processCenter/pages/creatProcess/qbrk/step9.vue | 6 ------ .../pages/creatProcess/qbrk/stepC1.vue | 12 ------------ .../pages/creatProcess/qbrk/stepC6.vue | 6 ------ 7 files changed, 55 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 8b3e54524..63dcdb1aa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -27,12 +27,6 @@ border :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" style="width: 10%;float: left;margin-right: 20px;"> - - - - - - - - - - - - - - - - - - -