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/components/index.js b/src/components/index.js index 4d040a51b..cb817aa18 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -26,6 +26,7 @@ import MechanismTree from './mechanismTree' import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' +import PhoneHistortTable from './phoneHistortTable' import phoneRole from './phoneRole' @@ -55,6 +56,7 @@ const install = function (Vue) { Vue.component('MechanismTree', MechanismTree) Vue.component('MySelect', MySelect) Vue.component('phoneRole', phoneRole) + Vue.component('PhoneHistortTable', PhoneHistortTable) } export default { diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue new file mode 100644 index 000000000..66c24d901 --- /dev/null +++ b/src/components/phoneHistortTable/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/main.js b/src/main.js index 4d44b6f12..e42289e04 100644 --- a/src/main.js +++ b/src/main.js @@ -116,12 +116,16 @@ router.beforeEach(function (to, from, next) { } } else { if (toName.slice(0,5) !== 'phone') { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + if (toName === 'processCenter') { + next() + }else { + 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}) + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } }else { - next() + extractedVerify(token) } } } else { @@ -232,7 +236,11 @@ router.beforeEach(function (to, from, next) { } } } else { - extracted3() + if (isMobile()){ + next() + } else { + extracted3() + } } } function extracted(routerPath) { @@ -276,7 +284,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..4d0fc0db7 --- /dev/null +++ b/src/pages/blankPage/index.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 7bd2ef5a8..ee6e15663 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -669,12 +669,12 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectAllStand"> - - + + + + + + { + if (this.showIETips) {//判断是否IE浏览器 + alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器') + } this.$router.push('/home2') }, e => { this.$message.warning('未获取到菜单') diff --git a/src/pages/loginVerify/index.vue b/src/pages/loginVerify/index.vue index d93995f79..59b24f73c 100644 --- a/src/pages/loginVerify/index.vue +++ b/src/pages/loginVerify/index.vue @@ -82,6 +82,9 @@ let routerParam = localStorage.getItem("routerParam"); // 路由跳转 if(routerParam && routerParam != ''){ + if (this.showIETips) {//判断是否IE浏览器 + alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器') + } const param = routerParam.split("&"); this.$router.push({ name: routerUrl, @@ -96,8 +99,6 @@ }else { this.$router.push('/'+routerUrl) } - - }, e => { this.$message.warning('未获取到菜单') }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 5a0178052..7c2c73e08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -817,7 +817,7 @@ - + - + - + - - - - + + + + - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 90e3f3259..07ebb1d69 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/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue new file mode 100644 index 000000000..5d323c182 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -0,0 +1,566 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue new file mode 100644 index 000000000..29118174e --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -0,0 +1,566 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue new file mode 100644 index 000000000..7c43985aa --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -0,0 +1,566 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue new file mode 100644 index 000000000..702cf9976 --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue @@ -0,0 +1,537 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue new file mode 100644 index 000000000..b595bafa5 --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue @@ -0,0 +1,537 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue new file mode 100644 index 000000000..ad9f2a823 --- /dev/null +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue @@ -0,0 +1,537 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step4.vue b/src/pages/processCenter/pages/phone/qbfs/step4.vue new file mode 100644 index 000000000..9dcb811f7 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step4.vue @@ -0,0 +1,550 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step2.vue b/src/pages/processCenter/pages/phone/qbfz/step2.vue new file mode 100644 index 000000000..986b5796d --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step2.vue @@ -0,0 +1,478 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue new file mode 100644 index 000000000..e526cfec0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -0,0 +1,634 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue new file mode 100644 index 000000000..5b65c2b23 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -0,0 +1,634 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue new file mode 100644 index 000000000..e7ab419a6 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -0,0 +1,634 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue new file mode 100644 index 000000000..3ec780a1b --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -0,0 +1,487 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue new file mode 100644 index 000000000..9c6662137 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue @@ -0,0 +1,487 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue new file mode 100644 index 000000000..9168cc48e --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue @@ -0,0 +1,487 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue new file mode 100644 index 000000000..c3f80c5f6 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue @@ -0,0 +1,487 @@ + + + + + + diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue index feb758afb..573f9a011 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step3.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -1,13 +1,538 @@ - diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue index e966bff51..1ea6a06c9 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step4.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue @@ -1,13 +1,538 @@ - diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue index 60a5fa44d..bf035914a 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step5.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue @@ -1,13 +1,538 @@ - diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue new file mode 100644 index 000000000..983dc078d --- /dev/null +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -0,0 +1,470 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index 34ed8f84a..cb3717d5d 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -85,69 +85,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }); - }, getData() { const params = { taskIds: this.taskIds, @@ -437,7 +352,7 @@ export default { phoneSumit (data) { if (this.roleTitle === '转办处理人') { this.roleTransfer = data - this.phoneRoleList = this.roleDutyPeople + this.phoneRoleList = this.roleTransfer this.turnLoading = true changeAssigneeNew({ taskId: this.taskIds, // 任务id @@ -448,7 +363,9 @@ export default { if (res.success) { this.turnLoading = false this.$message.success('调整成功') - this.$router.push("/processCenter") + this.$router.push({ + name: "processCenter" + }) } else { this.$message.warning(res.message) } diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index bb2853221..51ae3d310 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -64,70 +64,7 @@
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 +
{ - this.detailData = res - }, e => { - }); - }, getData() { const params = { taskIds: this.taskIds, 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/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="标准号"> -