From d688b4b2138c8687c441be15c31ca24ab96798ed Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 7 Jan 2022 10:34:31 +0800 Subject: [PATCH 1/8] commit --- .../standContrast/pages/comparisonClauses.vue | 6 ++++-- .../enterpriseStandardPlan/index.vue | 13 +++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/pages/localTool/standContrast/pages/comparisonClauses.vue b/src/pages/localTool/standContrast/pages/comparisonClauses.vue index 352d7122b..bc012a93b 100644 --- a/src/pages/localTool/standContrast/pages/comparisonClauses.vue +++ b/src/pages/localTool/standContrast/pages/comparisonClauses.vue @@ -56,7 +56,8 @@ -
+
+ @@ -109,7 +110,8 @@ -
+ +
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index fb30ab98c..3367086b7 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -755,7 +755,11 @@ } }, QYBZcloseDrawer () { - this.clearQYBZ() + this.QYBZform = { + page: 1, + standCode: '', + standName: '', + } }, QYBZenterDrawer () { if (this.QYBZformSelect.length > 1) { @@ -765,7 +769,11 @@ } else { this.addForm.rqbJson = this.QYBZformSelect[0].id this.addForm.rqbName = this.QYBZformSelect[0].standCode - this.clearQYBZ() + this.QYBZform = { + page: 1, + standCode: '', + standName: '', + } this.QYBZmodal = false } }, @@ -795,6 +803,7 @@ standCode: '', standName: '', } + this.QYBZget() }, choiceQYBZ (id) { if (this.DrawerType === 'see') { From 187e8804b1e6d2ee1fc848529977cf8907fea27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 7 Jan 2022 10:41:41 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/step1.vue | 49 ++++++++++--------- .../pages/creatProcess/qbzxdjhgk/step2.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/step3.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/step4.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/step5.vue | 2 +- 6 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 0014cd9f8..7c1ca6056 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 8f696fab7..73b3e97c7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -68,80 +68,85 @@ -

标准法规工程师

+

标准立项申请人

-
- -

申请部门高级经理

+

标准立项单位整车/系统总工

- +
- -

申请部门中心主任

+

创新技术委员会成员/标准体系工作组成员(必选)

+

二级研发(部所所长、总工、中心主任/研究院院长)(必选)

+

质量相关人员(可选)

+

制造部相关人员(可选)

+

采购部相关人员(可选)

+

海外相关人员(可选)

-
- -

标准法规工作组组长

+

标准体系专业工作组组长

- +
- -

标准法规部部长

+

工程研究总院标准法规部高级经理

- +
- -

标准法规部工程师

+

相关单位人员、工程研究总院标准法规部周知

- +
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 85f3c1774..9e2ef5889 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 09dbbfae0..b388590b8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 93143033c..ebd00421f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index a783a5123..c021631fd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
From a4278a016dfdbe1a009448a9d1c85cf7fabf3d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 7 Jan 2022 11:17:56 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 52ecd734b..f36e327c4 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -138,11 +138,11 @@ show-overflow-tooltip label="条款名称"> - - + + + + + Date: Fri, 7 Jan 2022 13:50:02 +0800 Subject: [PATCH 4/8] commit --- .../regulatoryRepository/enterpriseStandardPlan/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 3367086b7..81f4d6857 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -481,7 +481,7 @@ type="primary" size="mini" class="common-button-primary" - @click="QYBZget">查询 + @click="QYBZget('1')">查询 { From 6f2f6344e25c37fb4b9235dcbd6d9cca2d9aadb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 7 Jan 2022 14:08:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/roleManage/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 35dd4fc35..914b5f030 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -438,6 +438,7 @@ export default { this.addForm.remarks = row.remarks this.addForm.parentId = row.parentId this.addForm.parent = row.parent + this.addForm.useFlag = row.useFlag === 0 ? '禁用' : '启用' this.addForm.id = row.id this.nodeList3 = [] this.nodeList3.push(this.addForm.parentId) From 6293ba587fea9ec1a9959103c7dce5a39572c441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 7 Jan 2022 14:38:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 33 +- src/components/panel/PanelContent.vue | 2 +- .../processCenter/pages/processList/index.vue | 10 +- .../tabComponents/newProcess/index.vue | 740 ++++++++++++++++++ 4 files changed, 769 insertions(+), 16 deletions(-) create mode 100644 src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 8c109df39..c115b7ba8 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -208,23 +208,30 @@ ] }, { - title: '我的工作', + title: '工作中心', path: '/processCenter', 'icon-class': 'el-icon-s-platform', menuId: '3fadf', - children: [ - { - title: '流程中心', - path: '/processCenter', - menuId: '7455dc97eac2933341e18be659f07e89' - }, - { - title: '新建流程', - path: '/createProcessNew', - menuId: 'b53e6722b33a37c0fa2d87a9b06cca40' - } - ] + isChildren: true // 判断没有子菜单 }, + // { + // title: '我的工作', + // path: '/processCenter', + // 'icon-class': 'el-icon-s-platform', + // menuId: '3fadf', + // children: [ + // { + // title: '流程中心', + // path: '/processCenter', + // menuId: '7455dc97eac2933341e18be659f07e89' + // }, + // { + // title: '新建流程', + // path: '/createProcessNew', + // menuId: 'b53e6722b33a37c0fa2d87a9b06cca40' + // } + // ] + // }, { title: '本地工具', path: '/localTool', diff --git a/src/components/panel/PanelContent.vue b/src/components/panel/PanelContent.vue index 1ebd8a353..db561f29a 100644 --- a/src/components/panel/PanelContent.vue +++ b/src/components/panel/PanelContent.vue @@ -17,6 +17,6 @@ export default { height: calc(~'100% - 30px'); position: relative; background: @subContainerContentColor; - overflow: hidden; + overflow: auto; } diff --git a/src/pages/processCenter/pages/processList/index.vue b/src/pages/processCenter/pages/processList/index.vue index dc8e893b7..1d4d4ffb9 100644 --- a/src/pages/processCenter/pages/processList/index.vue +++ b/src/pages/processCenter/pages/processList/index.vue @@ -17,6 +17,7 @@ import AlreadyProcess from './tabComponents/alreadyProcess' import AlreadySend from './tabComponents/alreadySend' import MonitorProcess from './tabComponents/monitorProcess' import TaskDraft from './tabComponents/taskDraft' +import NewProcess from './tabComponents/newProcess' export default { name: 'index', @@ -47,7 +48,11 @@ export default { { title: '草稿', name: 'TaskDraft' - } + }, + { + title: '新建流程', + name: 'NewProcess' + }, ] return list.filter(item => { @@ -80,7 +85,8 @@ export default { AlreadyProcess, AlreadySend, MonitorProcess, - TaskDraft + TaskDraft, + NewProcess // SideBar, // MyProcess }, diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue new file mode 100644 index 000000000..40f0209ab --- /dev/null +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -0,0 +1,740 @@ + + + + From 01a714f630486e3ecaa614040d359cbd86085528 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 7 Jan 2022 15:12:03 +0800 Subject: [PATCH 7/8] commit --- src/pages/config/pages/mechanismManage/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 3e8039de6..7b1054ea3 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -59,7 +59,7 @@ + class="common-button-primary" @click="getDatas('1')"> 查询 @@ -446,7 +446,10 @@ export default { console.log(e); }) }, - getDatas() { + getDatas(type) { + if (type === '1') { + this.page = 1 + } this.peopleType = 2; this.$http.post('SarInstitution/institution/user', { current: this.page, From 38fdd149fec5da62f2fa0b512c6c504303093a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 7 Jan 2022 15:24:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index e996b9f6f..72e7545f8 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -5,7 +5,7 @@
{{this.infoForm.standNumSplit}} -- {{this.infoForm.standNameSplit}} - +