From 5190eca53cc000b1a9d7dfbfc80251fb9f532b6b 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, 17 Dec 2021 17:10:44 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 10 +++++----- .../regulatoryRepository/workingGroup/index.vue | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 81f20e724..e5f91a8f5 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -155,11 +155,11 @@ // path: '/partCodeApply', // menuId: 'ad9db496772c075f78495382b7581fe9' // }, - { - title: '工作组统计', - path: '/dataStatisComments', - menuId: '' - }, + // { + // title: '工作组统计', + // path: '/dataStatisComments', + // menuId: '' + // }, { title: '国内外政策', path: '/foreignRegulationsDatabase', diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue index 9c772a455..d171a7858 100644 --- a/src/pages/regulatoryRepository/workingGroup/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -14,6 +14,7 @@ + 工作组统计 diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index f6d315702..34ed8f84a 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -179,8 +179,10 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {changeAssigneeNew, completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js"; +import {Base64} from "js-base64"; +import {mapMutations} from "vuex"; export default { - name: "phoneWfhxStep3", + name: "phoneWfhxzgStep3", data() { return { passInfo: 0, @@ -241,6 +243,7 @@ export default { } }, methods: { + ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']), processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index c2f2fbd80..bb2853221 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -177,7 +177,7 @@ import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; export default { - name: "phoneWfhxStep5", + name: "phoneWfhxzgStep5", data() { return { drawerTitle: '', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index f31d2b44a..38b2dcab0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -452,7 +452,7 @@ @@ -460,7 +460,7 @@ @@ -468,7 +468,7 @@ @@ -2350,6 +2350,9 @@ export default { background: #ffffff; text-align: right; } + /deep/.el-date-editor.el-input { + width: 100%; + } } .labelBox { /deep/ .el-form-item__label { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 628777636..72db242c3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -517,7 +517,7 @@ @@ -525,7 +525,7 @@ @@ -533,7 +533,7 @@ @@ -2318,6 +2318,9 @@ export default { background: #ffffff; text-align: right; } + /deep/.el-date-editor.el-input { + width: 100%; + } } .labelBox { diff --git a/src/router/index.js b/src/router/index.js index b0b98c54c..3b9e1ac17 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,6 +4,15 @@ import store from '../store' import { Message } from 'element-ui' Vue.use(Router) const routes = [ + { + path: '/phoneIndex', + name: 'phoneIndex', + component: resolve => require(['@/pages/processCenter/pages/phone/index.vue'], resolve), + meta: { + requireAuth: true, + title: '动态跳转', + } + }, { path: '*', redirect: '/loginVerify' @@ -931,7 +940,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } }, { @@ -940,7 +949,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } }, { @@ -949,7 +958,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibraryC3', @@ -957,7 +966,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary4', @@ -965,7 +974,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary5', @@ -973,7 +982,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary6', @@ -981,7 +990,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibraryC6', @@ -989,7 +998,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary7', @@ -997,7 +1006,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary8', @@ -1005,7 +1014,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary9', @@ -1013,7 +1022,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary10', @@ -1021,7 +1030,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary11', @@ -1029,7 +1038,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary12', @@ -1037,7 +1046,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibraryDetail', @@ -1045,7 +1054,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } }, { @@ -2162,8 +2171,8 @@ const routes = [ } }, { - path: '/phoneWfhxStep3', - name: 'phoneWfhxStep3', + path: '/phoneWfhxzgStep3', + name: 'phoneWfhxzgStep3', component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step3.vue'), meta: { isBoolean: true, @@ -2172,8 +2181,8 @@ const routes = [ } }, { - path: '/phoneWfhxStep5', - name: 'phoneWfhxStep5', + path: '/phoneWfhxzgStep5', + name: 'phoneWfhxzgStep5', component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step5.vue'), meta: { isBoolean: true, diff --git a/src/store/isMobile/index.js b/src/store/isMobile/index.js new file mode 100644 index 000000000..6fce31161 --- /dev/null +++ b/src/store/isMobile/index.js @@ -0,0 +1,11 @@ + +/** navigator.userAgent可以获取浏览器信息(类型及系统) + * 获取使用的是手机端还是pc端 */ +export function isMobile () { + if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) { + return true // 手机端 + } else { + return false // PC端 + } +} +export default isMobile From b3ecd9596467f0670c8556aac505d94b20fcac11 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 17 Dec 2021 17:31:05 +0800 Subject: [PATCH 03/12] commit --- src/components/mechanismTree/index.vue | 8 ++++--- .../pages/creatProcess/bzdy/step1-9.vue | 18 +++++++-------- .../pages/creatProcess/bzdy/step2.vue | 4 ++-- .../pages/creatProcess/bzdy/step3.vue | 4 ++-- .../pages/creatProcess/bzdy/step4.vue | 4 ++-- .../pages/creatProcess/bzdy/step5.vue | 4 ++-- .../pages/creatProcess/bzdy/step6.vue | 4 ++-- .../pages/creatProcess/bzdy/step7.vue | 4 ++-- .../pages/creatProcess/bzdy/step8.vue | 4 ++-- .../pages/creatProcess/bzdy/step9.vue | 4 ++-- .../pages/creatProcess/bzjd/step1-6.vue | 18 +++++++-------- .../pages/creatProcess/bzjd/step2.vue | 4 ++-- .../pages/creatProcess/bzjd/step3.vue | 4 ++-- .../pages/creatProcess/bzjd/step4.vue | 4 ++-- .../pages/creatProcess/bzjd/step5.vue | 4 ++-- .../pages/creatProcess/bzjd/step6.vue | 4 ++-- .../pages/creatProcess/bzzqyj/step1-1.vue | 5 ++-- .../pages/creatProcess/bzzqyj/step1-9.vue | 18 +++++++-------- .../pages/creatProcess/bzzqyj/step1.vue | 5 ++-- .../pages/creatProcess/bzzqyj/step2.vue | 18 +++++++-------- .../pages/creatProcess/bzzqyj/step3.vue | 5 ++-- .../pages/creatProcess/bzzqyj/step4-1.vue | 4 ++-- .../pages/creatProcess/bzzqyj/step4-2.vue | 4 ++-- .../pages/creatProcess/bzzqyj/step4.vue | 18 +++++++-------- .../pages/creatProcess/bzzqyj/step5.vue | 4 ++-- .../pages/creatProcess/bzzqyj/step6.vue | 18 +++++++-------- .../pages/creatProcess/bzzqyj/step7.vue | 18 +++++++-------- .../pages/creatProcess/bzzqyj/step8.vue | 18 +++++++-------- .../pages/creatProcess/bzzqyj/step9.vue | 18 +++++++-------- .../enterpriseStandardPlan/index.vue | 23 +++++++++++++++---- 30 files changed, 145 insertions(+), 127 deletions(-) diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index 2c83ad0be..fca2173aa 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -2,6 +2,7 @@
{ this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.id = res.data[0].id }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index 489ce6cf1..959e597f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -138,20 +138,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center">
- - + +
+ prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center">
- - + +
+ prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { this.histortData = res + console.log(res); }, e => { }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 285a5407a..0fc1b12b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -199,7 +199,7 @@ sortable="custom" align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> @@ -258,11 +258,15 @@
+ + @@ -386,6 +390,7 @@ ids: [], addForm: { unit: '', // 单位 + unitName: '', esName: '', // 企标名称 planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 @@ -446,20 +451,27 @@ methods: { drawerCheckZRBM (data) { let list = '' + let listName = '' for (let a = 0; a < data.length; a++) { if (list.length > 0) { list += ',' - list += data[a].name + list += data[a].id + listName += ',' + listName += data[a].name } else { - list = data[a].name + list = data[a].id + listName = data[a].name } } this.addForm.unit = list + this.addForm.unitName = listName this.modalshowflagZRBM = false }, choiceZRBM(id) { this.nodeListZRBM = [] - this.nodeListZRBM = id.split(',') + if (id) { + this.nodeListZRBM = id.split(',') + } this.modalshowflagZRBM = true }, QCDWOK () { @@ -629,6 +641,7 @@ this.DrawerType = 'edit' this.addDrawer = true this.addForm = { + unitName:command[0].unitName, id: command[0].id, unit: command[0].unit, // 单位 esName: command[0].esName, // 企标名称 From b74978ab66acf3c388939d538eb3747711c9db19 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, 17 Dec 2021 17:36:35 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzqdfb/step1-1.vue | 1 + .../processCenter/pages/creatProcess/bzqdfb/step1.vue | 1 + .../processCenter/pages/creatProcess/bzqdfb/step3.vue | 1 + .../processCenter/pages/creatProcess/bzqdfb/step4.vue | 7 ++++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index ba13e4698..75225cd91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1126,6 +1126,7 @@ export default { } else { this.listForm.commentText = this.commentText this.listForm.fileName = this.fileInfoList + this.listForm.dataList = this.dataList var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index cf9ecbb40..1866f0943 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1056,6 +1056,7 @@ export default { } else { this.listForm.commentText = this.commentText this.listForm.fileName = this.fileInfoList + this.listForm.dataList = this.dataList var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 7226ebb6a..04670faab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -811,6 +811,7 @@ export default { //提交事件 handleSubmit() { this.listForm.commentText = this.commentText + this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 74796a561..79cdea8a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -234,7 +234,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; export default { name: "bzqdfbStep4", @@ -489,8 +489,9 @@ export default { }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.commentText = this.commentText; + this.isSubmit = true; + this.listForm.approvalOpinion = "2"; + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, From 1b557d8b80752964a7f0f1c8a700c7fb2f302d23 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 17 Dec 2021 21:46:09 +0800 Subject: [PATCH 05/12] feat:new --- src/main.js | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/main.js b/src/main.js index b0d77af88..2ba26a5fc 100644 --- a/src/main.js +++ b/src/main.js @@ -105,34 +105,50 @@ router.beforeEach(function (to, from, next) { localStorage.setItem('routerParam', param) } // 返回值为登录状态 - if ((token === null || token === '' ) && toName !== 'Login') { - if(webLoginType != null && webLoginType === 'idm' ){ - if(code){ - next() - }else { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - extractedVerify(token) - }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); - }else { - extractedLocalStorage('home2',''); - } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } + /** 判断是不是在手机端操作 */ + if (isMobile()) { + if ((token === null || token === '' ) && toName !== 'Login') { + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') + } else { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + if (toName.slice(0,5) !== 'phone') { + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) } - }else if(webLoginType != null && webLoginType === 'dev'){ - if (isMobile()) { - extractedVerify(token) - } else { - next('/Login') - } - } - }else { - extractedVerify(token) + } else { + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() + }else { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { + extractedVerify(token) + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } + } + }else if(webLoginType != null && webLoginType === 'dev'){ + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + + } + }else { + extractedVerify(token) + } } + function extractedVerify() { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { get_verify_by_instance({ @@ -215,23 +231,7 @@ router.beforeEach(function (to, from, next) { } } } else { - /** 判断是不是在手机端操作 */ - if (isMobile()) { - if (token === null || token === '') { - sessionStorage.setItem('param',JSON.stringify(param4)) - next('/phoneIndex') - } else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + - '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - if (toName.slice(0,5) !== 'phone') { - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } - } - } else { - extracted3() - } - // extracted3() + extracted3() } } function extracted(routerPath) { From 954e545eb73a8951cec9cb766ccd3a1af5127757 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 18 Dec 2021 14:05:55 +0800 Subject: [PATCH 06/12] feat: There is no way the, --- src/main.js | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/main.js b/src/main.js index 2ba26a5fc..44ae0505e 100644 --- a/src/main.js +++ b/src/main.js @@ -72,7 +72,7 @@ router.beforeEach(function (to, from, next) { let prcType = to.query.prcType; let routerType = to.query.routerType; let param = "taskIds=" + taskId + "&prcId=" + prcId - + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; + + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; let param4 = { path: path, token: token, @@ -105,50 +105,34 @@ router.beforeEach(function (to, from, next) { localStorage.setItem('routerParam', param) } // 返回值为登录状态 - /** 判断是不是在手机端操作 */ - if (isMobile()) { - if ((token === null || token === '' ) && toName !== 'Login') { - sessionStorage.setItem('param',JSON.stringify(param4)) - next('/phoneIndex') - } else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + - '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - if (toName.slice(0,5) !== 'phone') { - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } - } - } else { - if ((token === null || token === '' ) && toName !== 'Login') { - if(webLoginType != null && webLoginType === 'idm' ){ - if(code){ - next() - }else { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - extractedVerify(token) - }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); - }else { - extractedLocalStorage('home2',''); - } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } - } - }else if(webLoginType != null && webLoginType === 'dev'){ - if (isMobile()) { + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() + }else { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) - } else { - next('/Login') + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev } - } - }else { - extractedVerify(token) - } - } + }else if(webLoginType != null && webLoginType === 'dev'){ + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + } + }else { + extractedVerify(token) + } function extractedVerify() { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { get_verify_by_instance({ @@ -231,7 +215,23 @@ router.beforeEach(function (to, from, next) { } } } else { - extracted3() + /** 判断是不是在手机端操作 */ + if (isMobile()) { + if (token === null || token === '') { + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') + } else { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + if (toName.slice(0,5) !== 'phone') { + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } + } + } else { + extracted3() + } + // extracted3() } } function extracted(routerPath) { From afc9f0130fa630c3710664d654bdcb9069b02040 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 18 Dec 2021 16:03:16 +0800 Subject: [PATCH 07/12] feat: There is no way the, --- src/main.js | 79 +- .../processCenter/pages/newProcess/index.vue | 756 +++++++++--------- 2 files changed, 417 insertions(+), 418 deletions(-) diff --git a/src/main.js b/src/main.js index 44ae0505e..95d9b4ba1 100644 --- a/src/main.js +++ b/src/main.js @@ -105,34 +105,49 @@ router.beforeEach(function (to, from, next) { localStorage.setItem('routerParam', param) } // 返回值为登录状态 - if ((token === null || token === '' ) && toName !== 'Login') { - if(webLoginType != null && webLoginType === 'idm' ){ - if(code){ - next() + /** 判断是不是在手机端操作 */ + if (isMobile()) { + if ((token === null || token === '' ) && toName !== 'Login') { + if(toName !== 'phoneIndex'){ + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') }else { - if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { - extractedVerify(token) - }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); - }else { - extractedLocalStorage('home2',''); - } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev - } + next() } - }else if(webLoginType != null && webLoginType === 'dev'){ - if (isMobile()) { - extractedVerify(token) - } else { - next('/Login') + } else { + next() + } + } else { + if ((token === null || token === '' ) && toName !== 'Login') { + if(webLoginType != null && webLoginType === 'idm' ){ + if(code){ + next() + }else { + if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { + extractedVerify(token) + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } + } + }else if(webLoginType != null && webLoginType === 'dev'){ + if (isMobile()) { + extractedVerify(token) + } else { + next('/Login') + } + } - + }else { + extractedVerify(token) } - }else { - extractedVerify(token) } + function extractedVerify() { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { get_verify_by_instance({ @@ -215,23 +230,7 @@ router.beforeEach(function (to, from, next) { } } } else { - /** 判断是不是在手机端操作 */ - if (isMobile()) { - if (token === null || token === '') { - sessionStorage.setItem('param',JSON.stringify(param4)) - next('/phoneIndex') - } else { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + - '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - if (toName.slice(0,5) !== 'phone') { - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) - } - } - } else { - extracted3() - } - // extracted3() + extracted3() } } function extracted(routerPath) { diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 8503a7890..2a698bdbd 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -5,64 +5,64 @@

标准法规政策相关流程

- -
-
-
- -
-
-
标准入库流程
-
-
+ +
+
+
+ +
+
+
标准入库流程
+
- +
+
- -
-
-
- -
-
-
标准调研流程
-
-
+ +
+
+
+ +
+
+
标准调研流程
+
- +
+
- -
-
-
- -
-
-
标准征求意见流程
-
-
+ +
+
+
+ +
+
+
标准征求意见流程
+
- +
+
- -
-
-
- -
-
-
标准清单发布/更新流程
-
-
+ +
+
+
+ +
+
+
标准清单发布/更新流程
+
- +
+
@@ -125,7 +125,7 @@
- +
@@ -140,7 +140,7 @@
- +
@@ -155,7 +155,7 @@
- +
@@ -190,7 +190,7 @@

企业标准相关流程

- +
@@ -205,7 +205,7 @@
- +
@@ -220,7 +220,7 @@
- +
@@ -235,7 +235,7 @@
- +
@@ -256,7 +256,7 @@

标准化活动相关流程

- +
@@ -271,7 +271,7 @@
- +
@@ -301,7 +301,7 @@
- +
@@ -316,7 +316,7 @@
- +
@@ -331,7 +331,7 @@
- +
@@ -346,14 +346,14 @@
- -
+ +
-
参与外部标准制修订信息提报流程
+
加入标准化协会信息提报流程
@@ -363,118 +363,118 @@
-
+
From 0967df6ee3d8eba19e4f69ff531072a4fa7fe459 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 18 Dec 2021 16:04:48 +0800 Subject: [PATCH 08/12] feat:new --- src/main.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main.js b/src/main.js index 95d9b4ba1..8c85878f3 100644 --- a/src/main.js +++ b/src/main.js @@ -136,12 +136,7 @@ router.beforeEach(function (to, from, next) { } } }else if(webLoginType != null && webLoginType === 'dev'){ - if (isMobile()) { - extractedVerify(token) - } else { - next('/Login') - } - + next('/Login') } }else { extractedVerify(token) From 462fb836af20534c6d16661b2b8c4ecfac9e26b9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 18 Dec 2021 16:28:38 +0800 Subject: [PATCH 09/12] feat: There is no way the, --- src/main.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 95d9b4ba1..d126494a2 100644 --- a/src/main.js +++ b/src/main.js @@ -115,7 +115,14 @@ router.beforeEach(function (to, from, next) { next() } } else { - next() + if (toName.slice(0,5) !== 'phone') { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + }else { + next() + } } } else { if ((token === null || token === '' ) && toName !== 'Login') { From d7531630ad3c53d514aa18def85ecb0cdd1ea5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 19 Dec 2021 11:23:09 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step10.vue | 2 +- .../pages/creatProcess/xmpg2/step12.vue | 2 +- .../pages/creatProcess/xmpg2/step8.vue | 2 +- .../pages/creatProcess/xmpg2/step9.vue | 2 +- .../pages/phone/xmpg2/step10.vue | 595 ++++++++++++++++++ .../pages/phone/xmpg2/step11.vue | 571 +++++++++++++++++ .../pages/phone/xmpg2/step12.vue | 595 ++++++++++++++++++ .../processCenter/pages/phone/xmpg2/step7.vue | 13 + .../processCenter/pages/phone/xmpg2/step8.vue | 595 ++++++++++++++++++ .../processCenter/pages/phone/xmpg2/step9.vue | 595 ++++++++++++++++++ src/router/index.js | 50 ++ 11 files changed, 3018 insertions(+), 4 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step10.vue create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step11.vue create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step12.vue create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step8.vue create mode 100644 src/pages/processCenter/pages/phone/xmpg2/step9.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index ec24a8ff7..c07086c46 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -503,7 +503,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { this.listForm.bzFlag = "2"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index eceacd7cd..1a973f96c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -503,7 +503,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText ) { this.$message.warning("请填写审批意见"); } else { this.listForm.dlFlag = "2"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index b7086caf7..943cd51c7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -501,7 +501,7 @@ export default { }, //驳回事件 beforeBack() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ this.listForm.jgFlag = "2"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 40af6729e..ff6f995eb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -503,7 +503,7 @@ export default { }, //驳回事件 beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { + if (!this.commentText) { this.$message.warning("请填写审批意见"); } else { this.listForm.gcFlag = "2"; diff --git a/src/pages/processCenter/pages/phone/xmpg2/step10.vue b/src/pages/processCenter/pages/phone/xmpg2/step10.vue new file mode 100644 index 000000000..d432ec902 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step10.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step11.vue b/src/pages/processCenter/pages/phone/xmpg2/step11.vue new file mode 100644 index 000000000..44cd9f7d0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step11.vue @@ -0,0 +1,571 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step12.vue b/src/pages/processCenter/pages/phone/xmpg2/step12.vue new file mode 100644 index 000000000..51ec62dcf --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step12.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step7.vue b/src/pages/processCenter/pages/phone/xmpg2/step7.vue index ed65b1c7b..4b145a6bd 100644 --- a/src/pages/processCenter/pages/phone/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/phone/xmpg2/step7.vue @@ -174,6 +174,7 @@ label="责任人"> + 加载更多...
@@ -282,6 +283,8 @@ export default { }, data() { return { + tableIndex: 0, + itemLists: [], foldFormFlag: false, total: 0, currentPage: 1, @@ -314,6 +317,16 @@ export default { }; }, methods: { + tableLoading () { + this.tableIndex++ + let index = this.tableIndex * 20 + let endIndex = index + 20 + if (this.tableIndex * 20 > this.itemLists.length) { + this.$message.warning('没有更多了') + } + let newData = this.itemLists.slice(index, endIndex) + this.itemList = this.itemList.concat(newData) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag diff --git a/src/pages/processCenter/pages/phone/xmpg2/step8.vue b/src/pages/processCenter/pages/phone/xmpg2/step8.vue new file mode 100644 index 000000000..23749e457 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step8.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg2/step9.vue b/src/pages/processCenter/pages/phone/xmpg2/step9.vue new file mode 100644 index 000000000..02ce9a886 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg2/step9.vue @@ -0,0 +1,595 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 3b9e1ac17..2b3dfee14 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2110,6 +2110,56 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/phoneXmpg2Step8', + name: 'phoneXmpg2Step8', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step8.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, + { + path: '/phoneXmpg2Step9', + name: 'phoneXmpg2Step9', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step9.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, + { + path: '/phoneXmpg2Step10', + name: 'phoneXmpg2Step10', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step10.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, + { + path: '/phoneXmpg2Step11', + name: 'phoneXmpg2Step11', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step11.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, + { + path: '/phoneXmpg2Step12', + name: 'phoneXmpg2Step12', + component: () => import('@/pages/processCenter/pages/phone/xmpg2/step12.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/phoneXmqdqrStep5', name: 'phoneXmqdqrStep5', From d90d1310b469baff624e175b5aa35d4ac972534c Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 19 Dec 2021 11:29:28 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 7 +- src/main.js | 6 +- src/pages/blankPage/index.vue | 29 ++ .../pages/creatProcess/wfhxzg/step1.vue | 2 +- .../pages/creatProcess/wfhxzg/step2.vue | 66 +--- .../pages/creatProcess/wfhxzg/step3.vue | 2 +- .../pages/creatProcess/wfhxzg/step4.vue | 68 +---- .../pages/creatProcess/wfhxzg/step5-1.vue | 68 +---- .../pages/creatProcess/wfhxzg/step5.vue | 2 +- .../pages/addEdit.vue | 288 +----------------- .../pages/otherAddEit.vue | 184 ----------- .../pages/projectAddEit.vue | 155 +--------- src/router/index.js | 10 + 13 files changed, 69 insertions(+), 818 deletions(-) create mode 100644 src/pages/blankPage/index.vue diff --git a/src/App.vue b/src/App.vue index 947dc7879..5ddb7f29c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -238,7 +238,12 @@ export default { }, // 监听路由 控制isBoolean $route() { - if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex') { + if (this.$route.name !== 'Login' && this.$route.name !== 'Home' + && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' + && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' + && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' + && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' + && this.$route.name !== 'blankPage') { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/main.js b/src/main.js index 4d44b6f12..c5055a27d 100644 --- a/src/main.js +++ b/src/main.js @@ -276,7 +276,11 @@ router.beforeEach(function (to, from, next) { } if(path === '/loginVerify'){ if(webLoginType != null && webLoginType === 'dev'){ - next('/Login') + if(isMobile()) { + next('/blankPage') + } else { + next('/Login') + } }else { next() } diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue new file mode 100644 index 000000000..cecd598ee --- /dev/null +++ b/src/pages/blankPage/index.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e312fcbca..601528c98 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -23,7 +23,7 @@ :data="dataList" border ref="entryTable" - height="49%" + height="80%" @selection-change="selectedDelete" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 90e3f3259..df7fb02ec 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -13,70 +13,6 @@ -
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 5d4d4594d..6c6776c5b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -28,7 +28,7 @@ border ref="multipleTable" @selection-change="handleSelectionMore" - height="49%" + height="80%" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 6d13ad4df..3663c097b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -13,76 +13,10 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue index 09501d5fc..69084efee 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue @@ -13,76 +13,10 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 6c902ccab..3264cfc95 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -16,7 +16,7 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 79b6974d5..117aa3e11 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -298,7 +298,7 @@ align="center" label="标准号"> -