From 2ddd23536a03e99ff5e4e0a83e2a9cf9397d8a85 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 09:29:15 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=B3=A8=E6=8E=89?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/linkManage/linkType/firstLink.vue | 16 +++++++++++----- .../pages/linkManage/linkType/secondLink.vue | 18 ++++++++++++------ src/pages/home2/components/empennage/index.vue | 8 ++++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index c15071f96..5e0fa37d1 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -52,14 +52,14 @@ prop="name" label="链接名称"> - - + --> - + 取消 - 确定 + 确定 @@ -203,6 +203,7 @@ export default { imageUrl: '', uploadUrl: 'api/att/attFile/upload', + subLoading: false } }, methods: { @@ -351,6 +352,7 @@ export default { submit() { this.$refs['sarStandardsInfoForm'].validate((valid) => { if (valid) { + this.subLoading = true if (this.type === 1) { this.$http.postData('sarUrl/tsUrl/add', { ...this.sarStandardsInfoEO, @@ -360,12 +362,14 @@ export default { }, res => { if (res.ok) { this.$message.success('新增成功') + this.subLoading = false this.modalshowflag = false this.imageUrl = '' this.linkListFirst = [] this.getLink() } else { this.$message.warning(res.message) + this.subLoading = false } }) } else { @@ -382,11 +386,13 @@ export default { }, res => { if (res.ok) { this.$message.success('修改成功') + this.subLoading = false this.modalshowflag = false this.linkListFirst = [] this.getLink() } else { this.$message.warning(res.message) + this.subLoading = false } }) } diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue index 6c91e0b35..176f84c68 100644 --- a/src/pages/config/pages/linkManage/linkType/secondLink.vue +++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue @@ -52,14 +52,14 @@ prop="name" label="链接名称"> - - + --> - + 取消 - 确定 + 确定 @@ -203,7 +203,8 @@ export default { imageUrl: '', uploadUrl: 'api/att/attFile/upload', - verifyImg: '' + verifyImg: '', + subLoading: false } }, methods: { @@ -353,6 +354,7 @@ export default { submit() { this.$refs['sarStandardsInfoForm'].validate((valid) => { if (valid) { + this.subLoading = true if (this.type === 1) { this.$http.postData('sarUrl/tsUrl/add', { ...this.sarStandardsInfoEO, @@ -362,11 +364,13 @@ export default { }, res => { if (res.ok) { this.$message.success('新增成功') + this.subLoading = false this.modalshowflag = false this.linkListSecond = [] this.getLink() } else { this.$message.warning(res.message) + this.subLoading = false } }) } else { @@ -382,11 +386,13 @@ export default { }, res => { if (res.ok) { this.$message.success('修改成功') + this.subLoading = false this.modalshowflag = false this.linkListSecond = [] this.getLink() } else { this.$message.warning(res.message) + this.subLoading = false } }) } diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 8404410b8..66e7ad0ea 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -9,10 +9,10 @@ - + v-if="index < 5">--> {{ item.name.slice(0, 8) + '...' }} {{ item.name }} @@ -29,10 +29,10 @@ - + v-if="index < 5">--> {{ item.name.slice(0, 8) + '...' }} {{ item.name }} From a554faad37aaecb5eabcb65d5b6b61fdac628c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 7 Dec 2021 09:29:19 +0800 Subject: [PATCH 02/10] commit --- src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfz/step7.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index 6873b34a1..ab6692037 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index cf8da71f2..5577caa3e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 3fbd3b60f..799c8fe08 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -2,7 +2,7 @@
- +
基础信息
From fd449a232f5eaad4a8f69d9859fec44ceb15ac19 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 7 Dec 2021 10:06:45 +0800 Subject: [PATCH 03/10] commit --- src/pages/localTool/standCalendar/index.vue | 6 +- .../localTool/standardRecognition/index.vue | 2 +- .../processCenter/pages/phone/bzdy/step8.vue | 442 ++++++++++++++++++ .../processCenter/pages/phone/bzdy/step9.vue | 442 ++++++++++++++++++ src/router/index.js | 20 + 5 files changed, 908 insertions(+), 4 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzdy/step8.vue create mode 100644 src/pages/processCenter/pages/phone/bzdy/step9.vue diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 9b9f0d737..606229d2c 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -8,12 +8,12 @@
- {{ item }} + {{ item }} - {{ item }} + {{ item }}
@@ -56,7 +56,7 @@
暂无会议
- + 会议 会议 diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index baf52ffe1..21838c0db 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -106,7 +106,7 @@ - 获取文件 +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + + +
+ + + + + + + + + + +
+ {{ form.hzfileName }} +
+
+ - - +
+ + + + + + + + + + +
+ + 隐藏基础信息 + 展开基础信息 + +
+ + + + + + + + + + + + + + +
+ + +
+ + +
+
+ + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue new file mode 100644 index 000000000..dadc83ed7 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -0,0 +1,442 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 4d8070d1a..b24e93d0e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1248,6 +1248,26 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/phoneBzdyStep8', + name: 'phoneBzdyStep8', + component: () => import('@/pages/processCenter/pages/phone/bzdy/step8.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/phoneBzdyStep9', + name: 'phoneBzdyStep9', + component: () => import('@/pages/processCenter/pages/phone/bzdy/step9.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep1-9', name: 'bzdyStep1-9', From ea18ed54c161719a6fd2d09499adbeb1a1656eb0 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 13:25:00 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 9 +++ .../pages/creatProcess/bzhHd-rh/step2.vue | 3 + .../pages/creatProcess/bzhHd-rh/step4.vue | 3 + .../pages/creatProcess/bzhHd-rh/step6.vue | 5 ++ .../pages/creatProcess/bzhHh-hh/step2.vue | 3 + .../pages/creatProcess/bzhHy-ch/step2.vue | 3 + .../pages/creatProcess/bzhHy-ch/step4.vue | 3 + .../pages/creatProcess/bzhHy-ch/step6.vue | 5 ++ .../pages/creatProcess/wfhxzg/step3.vue | 3 - .../pages/creatProcess/wfhxzg/step5.vue | 3 + .../pages/phone/wfhxzg/step5.vue | 5 +- .../tabComponents/taskDraft/index.vue | 48 ++++++++++++- src/router/index.js | 70 +++++++++++++++++++ 13 files changed, 155 insertions(+), 8 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index cfab0cb4e..683f86681 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -137,6 +137,15 @@ export function queryTaskFirst (data) { params: data }) } + +// 草稿删除 +export function taskDel (data) { + return axios({ + url: '/api/lawss/activiti/delCG', + method: 'post', + params: data + }) +} // 整改流程 详情查询nonconformity export function getNonconformity (data) { return axios({ diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index cb3106e91..1082a588c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -269,6 +269,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzrhStep2') + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 593e411dc..a306f33cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -292,6 +292,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzrhStep4') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 51673820e..834b8905c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -303,6 +303,11 @@ export default { this.getData() }, methods: { + phoneClick () { + if (this.taskInfo !== '标准法规工程师汇总修订完毕') { + this.$router.push('/phoneBzrhStep6') + } + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue index aac1c3c67..de46ff5d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -274,6 +274,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzhhStep2') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index df261c830..1a8d9166d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -241,6 +241,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzchStep2') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 40e385017..5b07fb850 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -246,6 +246,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzchStep4') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index a11847ce6..c2daaa0c5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -260,6 +260,11 @@ export default { this.getData() }, methods: { + phoneClick () { + if (this.taskInfo !== '标准法规工程师修订完毕') { + this.$router.push('/phoneBzchStep6') + } + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 1d18d8aea..10dd1a94b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -235,9 +235,6 @@ export default { } }, methods: { - phoneClick () { - this.$router.push('/phoneWfhxStep4') - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 3f6afc40c..b27f634d1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -225,6 +225,9 @@ export default { } }, methods: { + phoneClick () { + this.$router.push('/phoneWfhxStep5') + }, queryFile(row) { this.fileTextList = row.fileText this.fileMadel = true diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index 2dd643d0f..b438e87c6 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -63,7 +63,7 @@
-
+
清空 + 删除
@@ -115,16 +116,17 @@ {{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }} - + @@ -144,6 +146,7 @@ + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/xmpg/step2.vue new file mode 100644 index 000000000..9edcfa4a0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step2.vue @@ -0,0 +1,575 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue new file mode 100644 index 000000000..d55f74197 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -0,0 +1,679 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/xmpg/step6.vue new file mode 100644 index 000000000..4f758a8dc --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step6.vue @@ -0,0 +1,666 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/xmpg/step7.vue new file mode 100644 index 000000000..f489f7fb1 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step7.vue @@ -0,0 +1,662 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 4b0b17c49..dfdcc7173 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1984,6 +1984,56 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/phoneBzqdfbStep4', + name: 'phoneBzqdfbStep4', + component: () => import('@/pages/processCenter/pages/phone/bzqdfb/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, + { + path: '/phoneXmpgStep2', + name: 'phoneXmpgStep2', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/phoneXmpgStep5', + name: 'phoneXmpgStep5', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/phoneXmpgStep6', + name: 'phoneXmpgStep6', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step6.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/phoneXmpgStep7', + name: 'phoneXmpgStep7', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5', From 4b8686678ba3c6647437124a6bc9d31413f581b9 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 14:22:55 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/taskDraft/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bdcc58f52..bc316dd0b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -184,7 +184,7 @@ export default { size: parseInt(this.$store.getters.userInfo.configContent), userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, prcName: this.searchForm.prcName, - prcType: parseInt(this.searchForm.prcType) || '' + prcType: this.searchForm.prcType }, { loading: 'loading', From 3b8be63a250af0a376bb0c5e5f3386d9b12620e8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 7 Dec 2021 14:36:54 +0800 Subject: [PATCH 09/10] commit --- .../localTool/standardRecognition/index.vue | 264 +++--------------- .../components/EnterpriseStandardDatabase.vue | 28 +- 2 files changed, 45 insertions(+), 247 deletions(-) diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index 21838c0db..a7cdcad16 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -10,6 +10,9 @@ 删除 + 编辑
@@ -100,26 +103,17 @@ width="120" > - + @@ -165,12 +159,14 @@ {{ $t("m.upload")+' PDF'}}
{{ $t("m.upload")+' PDF'}}
@@ -719,6 +715,7 @@ export default { components: {}, data() { return { + selectTableDatas: [], textStatusMap: {}, // 文本状态id与name对应 lawInfoTable:[], lawInfoTableLoading: true, @@ -784,184 +781,7 @@ export default { { required: true, message: '文件不能为空', trigger: 'change' } ] }, - options: [ - // { - // value: "STAND_FILE", - // label: "标准文本", - // }, - // { - // value: "DRAFT_FILE", - // label: "草案", - // }, - // { - // value: "OPINION_FILE", - // label: "征求意见稿", - // }, - // { - // value: "SENT_SCREEN_FILE", - // label: "送审稿", - // }, - // { - // value: "APPROVAL_FILE", - // label: "报批稿", - // }, - // { - // value: "RELEVANCE_FILE", - // label: "关联文件", - // }, - ], -/* standRecoColumn: [ - { - type: 'selection', - width: 60, - align: 'center' - }, - { - title: '序号', - type: 'index', - align: 'center' - }, - { - title: '资料类型', - key: 'fileType', - align: 'center', - render: (h, params) => { - let texts - if (params.row.fileType === '1') { - texts = '国内标准法规' - } else if (params.row.fileType === '2') { - texts = '海外标准法规' - } else if (params.row.fileType === '3') { - texts = '政策' - } else if (params.row.fileType === '4') { - texts = '企业标准' - } else { - texts = '标准' - } - return h('div', { - class: { - 'text-overflow-hidden': true - }, - attrs: { - title: texts - } - }, texts) - } - }, - { - title: '标准号/政策号', - key: 'standNumber', - align: 'center' - }, - { - title: '标准名称/政策名称', - key: 'standName', - align: 'center' - }, - { - title: '文本状态', - key: 'fileStatus', - align: 'center', - render: (h, params) => { - let texts - if (params.row.fileType === 'STAND_FILE') { - texts = '标准文本' - } else if (params.row.fileType === 'DRAFT_FILE') { - texts = '草案' - } else if (params.row.fileType === 'OPINION_FILE') { - texts = '征求意见稿' - } else if (params.row.fileType === 'SENT_SCREEN_FILE') { - texts = '送审稿' - } else if (params.row.fileType === 'APPROVAL_FILE') { - texts = '报批稿' - } else if (params.row.fileType === 'RELEVANCE_FILE') { - texts = '关联文件' - } - return h('div', { - class: { - 'text-overflow-hidden': true - }, - attrs: { - title: texts - } - }, texts) - } - }, - { - title: '转换结果', - key: 'resultContent', - align: 'center' - }, - { - title: '消耗时间', - key: 'spendTime', - align: 'center' - }, - { - title: '操作', - key: 'action', - width: 200, - align: 'center', - render: (h, params) => { - return h('div', [ - h('Button', { - props: { - type: 'primary', - size: 'small' - }, - style: { - marginRight: '5px' - }, - on: { - click: () => { - this.downloadFile(params.row) - } - } - }, '获取文件'), - h('Button', { - props: { - type: 'warning', - size: 'small' - }, - style: { - marginRight: '5px' - }, - on: { - click: () => { - this.editOcrRecord(params.row) - } - } - }, '编辑'), - h('Dropdown', { - props: { - trigger: 'click' - }, - on: { - 'on-click': (value) => {} - } - }, [ - h('Button', { - props: { - type: 'primary', - size: 'small' - } - }, '更多'), - h('DropdownMenu', { - slot: 'list' - }, - this.dropdownItems.map(function (type) { - return h('DropdownItem', { - props: { - name: type.val - } - }, type.val) - }) - ) - ]) - ]) - } - } - ],*/ + options: [], modalType: "", standRecoList: [], selectTableData: [], @@ -1237,6 +1057,7 @@ export default { this.selectTableData = []; for (let i = 0; i < data.length; i++) { this.selectTableData.push(data[i].id); + this.selectTableDatas.push(data[i]) } }, // 上传 @@ -1326,28 +1147,32 @@ export default { this.$refs["importFileAboutStand"].clearFiles(); }, // 编辑 - editOcrRecord(row) { - console.log('575',row) - this.modalType = "2"; - this.title = "编辑信息"; - this.btnName = "保存"; - this.uploadFilesdfEo.fileName = row.fileName - this.uploadModal = true; - this.uploadFilesdfEo.standNumber = JSON.parse( - JSON.stringify(row) - ).standNumber; - this.uploadFilesdfEo.standName = JSON.parse( - JSON.stringify(row) - ).standName; - // this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType - this.options.map((item) => { - if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) { - this.uploadFilesdfEo.fileType = item.attrName; - } - }); - this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id; - this.uploadFilesdfEo.attId = ""; - this.defaultFileList = []; + editOcrRecord() { + if (this.selectTableDatas.length === 1) { + let row = this.selectTableDatas[0] + this.modalType = "2"; + this.title = "编辑信息"; + this.btnName = "保存"; + this.uploadFilesdfEo.fileName = row.fileName + this.uploadModal = true; + this.uploadFilesdfEo.standNumber = JSON.parse( + JSON.stringify(row) + ).standNumber; + this.uploadFilesdfEo.standName = JSON.parse( + JSON.stringify(row) + ).standName; + // this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType + this.options.map((item) => { + if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) { + this.uploadFilesdfEo.fileType = item.attrName; + } + }); + this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id; + this.uploadFilesdfEo.attId = ""; + this.defaultFileList = []; + } else { + this.$message.warning('请选择一条数据进行编辑') + } }, // 提交 uploadSave() { @@ -1519,7 +1344,7 @@ export default { (res) => { if (res.ok) { this.standRecoList = res.data.list; - this.total = res.data.list.length; + this.total = res.data.count } }, e => {} @@ -1533,7 +1358,6 @@ export default { _this: this }, res => { this.options = res.data - console.log(this.options); }) this.getTableData(); }, diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c945e6ca6..64a078d7d 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -18,7 +18,7 @@ :indent="0" :props="props" :data="treeList" - default-expanded-keys="['3']" + :default-expanded-keys="['3']" highlight-current @node-click="treeClick" :filter-node-method="filterNode"> @@ -404,11 +404,8 @@ v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
From c56286e34cdbdc9e6e0400f8ec48375824e7781a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 7 Dec 2021 14:47:10 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=8B=A9=E8=B4=A3=E4=BB=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step2.vue | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 9f94f9e6c..3c5bf7f10 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -121,7 +121,7 @@ v-model="qbfsForm.jgUser" placeholder="请选择工作组成员" clearable - @click.native="choiceZRR(null,'jgUser', '选择工作组成员', roleForm.jgUser)" + @click.native="choiceZRRS" > @@ -235,7 +235,7 @@ :is-title="drawerTitle" :is-visible.sync="modalshowflag" @checkedRole="checkedRole" - :nodeList="nodeList" + :nodeList="nodeList2" >
@@ -260,6 +260,7 @@ export default { commentText: '', detailData: [], nodeList: [], + nodeList2: [], isSubmit: false, saveLoading: false, isTransfer: false, @@ -396,14 +397,12 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, - choiceZRR(scope, type, title, id) { - if (scope != null) { - this.dsadadadsada = scope.$index; + choiceZRRS() { + this.drawerTitle = '请选择工作组成员' + this.nodeList2 = []; + if (this.qbfsForm.jgUserId) { + this.nodeList2 = this.qbfsForm.jgUserId.split(","); } - this.nodeList = []; - this.nodeList.push(id); - this.type = type; - this.drawerTitle = title; this.modalshowflag = true; }, checkedRole(data) {