diff --git a/src/App.vue b/src/App.vue index 77b537dbb..610b62e0c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -215,7 +215,7 @@ export default { && 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.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/phone.js b/src/api/phone.js index ae39051e5..f1dbbb271 100644 --- a/src/api/phone.js +++ b/src/api/phone.js @@ -1,5 +1,6 @@ import axios from "@/common/axiosV2"; +// 手机端查询人 export function phoneUser(params) { return axios({ url: "api/sys/user/getUserByPhone", diff --git a/src/api/process.js b/src/api/process.js index 1c260eefc..6bb77e017 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -713,7 +713,7 @@ export function workGroup(data) { params: data }) } -// +// 手机端查询token export function loginMobile(data) { return axios({ url: 'api/lawss/activiti/loginMobile', @@ -721,3 +721,20 @@ export function loginMobile(data) { params: data }) } + +// 日历信息编辑 +export function updateMeet(data) { + return axios({ + url: '/api/sapMeetInfo/updateMeeting', + method: 'post', + params: data + }) +} + +export function upFile(data) { + return axios({ + url: '/api/att/attFile/upload', + method: 'post', + data + }) +} diff --git a/src/main.js b/src/main.js index dd100ae16..307cf0aa7 100644 --- a/src/main.js +++ b/src/main.js @@ -106,30 +106,41 @@ router.beforeEach(function (to, from, next) { } // 返回值为登录状态 /** 判断是不是在手机端操作 */ + debugger if (isMobile()) { - if ((token === null || token === '' ) && toName !== 'Login') { - if(toName !== 'phoneIndex'){ - sessionStorage.removeItem("param"); - sessionStorage.setItem('param',JSON.stringify(param4)) - next('/phoneIndex') - }else { - next() - } - } else { - 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 { - if(toName !== 'blankPage'){ - if(to.matched.length == 0){ + if(toName === 'processCenter'){ + window.location.href="about:blank"; + window.close(); + }else { + if ((token === null || token === '' ) && toName !== 'Login') { + if(toName !== 'phoneIndex'){ + sessionStorage.removeItem("param"); + sessionStorage.setItem('param',JSON.stringify(param4)) + next('/phoneIndex') + }else { + next() + } + } else { + if (toName.slice(0,5) !== 'phone') { + if(toName === 'LoginVerify'){ next('/blankPage') + }else { + if(toName === 'blankPage' || toName === 'processedPage') { + next() + }else { + extractedVerify() + } + } + }else { + if(toName !== 'blankPage'){ + if(to.matched.length === 0){ + next('/blankPage') + }else { + next() + } }else { next() } - }else { - next() } } } @@ -174,48 +185,54 @@ router.beforeEach(function (to, from, next) { let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus; let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished; - if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成 - // 根据type判断跳转具体流程页面 - if (prcType === '1') { - // 标准入库流程数据 - extracted("bzrkStep5"); - } else if (prcType === '4') { - //标准清单发布流程数据 - extracted("bzqdfbStep1-4"); - } else if (prcType === '5') { - //标准项目合规评估 标准维度 - if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { - extracted("xmpgStep1-2"); - } else { - extracted("xmpgStep1-7"); + if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成 + if(isMobile()){ + next('/processedPage') + }else { + // 根据type判断跳转具体流程页面 + if (prcType === '1') { + // 标准入库流程数据 + extracted("bzrkStep5"); + } else if (prcType === '4') { + //标准清单发布流程数据 + extracted("bzqdfbStep1-4"); + } else if (prcType === '5') { + //标准项目合规评估 标准维度 + if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { + extracted("xmpgStep1-2"); + } else { + extracted("xmpgStep1-7"); + } + } else if (prcType === '6') { + //标准项目合规评估 项目维度 + if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { + extracted("xmpg2Step1-2"); + } else { + extracted("xmpg2Step1-12"); + } + } else if (prcType === '8') { + // 未符合项整改 + extracted("wfhxzgStep5-1"); + } else if (prcType === '9') { + extracted("bzjdStep1-6"); + //标准调研流程 + } else if (prcType === '2') { + extracted("bzdyStep1-9"); + } else if (prcType === '3') { + //标准征求意见 + extracted("bzzqyjStep1-9"); + } else if (prcType === '10') { + //项目清单确认 + extracted("xmqdqrStep1-3"); + } } - } else if (prcType === '6') { - //标准项目合规评估 项目维度 - if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { - extracted("xmpg2Step1-2"); - } else { - extracted("xmpg2Step1-12"); - } - } else if (prcType === '8') { - // 未符合项整改 - extracted("wfhxzgStep5-1"); - } else if (prcType === '9') { - extracted("bzjdStep1-6"); - //标准调研流程 - } else if (prcType === '2') { - extracted("bzdyStep1-9"); - } else if (prcType === '3') { - //标准征求意见 - extracted("bzzqyjStep1-9"); - } else if (prcType === '10') { - //项目清单确认 - extracted("xmqdqrStep1-3"); - } } else { // 业务系统 当前节点未完成 // commitStatus 大于0 表示当前节点存在未完成干活流程 // isNotFinished OA 系统显示接受任务 已置为已办 if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) { - if (prcType === '3') { + if(isMobile()) { + extractedIphone() + }else if (prcType === '3') { //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 if (path === '/bzzqyjStep3') { extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); @@ -246,7 +263,12 @@ router.beforeEach(function (to, from, next) { } } } else { - extracted3() + if(isMobile()) { + extractedIphone() + }else{ + extracted3() + } + } } function extracted(routerPath) { @@ -268,6 +290,13 @@ router.beforeEach(function (to, from, next) { next() } } + + function extractedIphone() { + 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}) + } function extracted2(routerPath,param2) { if (token === null || token === '') { extractedLocalStorage(routerPath,param2); diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue index 4d0fc0db7..38fae68c1 100644 --- a/src/pages/blankPage/index.vue +++ b/src/pages/blankPage/index.vue @@ -2,7 +2,7 @@
当前任务不支持手机端处理
- 返回 + 返回
@@ -16,7 +16,12 @@ export default { data() { return {} }, - methods: {} + methods: { + closeWindow(){ + window.location.href="about:blank"; + window.close(); + } + } } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 888026112..34122febe 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -656,6 +656,12 @@ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" >关联条款 + 编辑
- - - - - - + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0){ + this.editResolveListShowflag = true + let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0])) + this.resolveListForm = editItem + this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):'' + // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):'' + }else { + this.$message.warning('请选择一条数据') } }, + saveEditInfo(){ + console.log('2530',this.resolveListForm) + this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',') + this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',') + this.$http.putData( + 'SarStandItems/sar-stand-items/updateSarItemAndInterpretation', + this.resolveListForm, + { + _this: this, + }, + (res) => { + console.log(res) + if (res.ok){ + this.$message.success('修改成功') + this.resetEditResolveListForm() + this.showItemsModel() + } + } + ) + }, + resetEditResolveListForm(){ + this.editResolveListShowflag = false + }, // 分页点击后方法 pageChange(page) { this.standItemSearch.page = page @@ -3298,6 +3525,16 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index 4d6bc0a6d..cc41fa64f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,6 +23,15 @@ const routes = [ title: '手机提示页面', } }, + { + path: '/processedPage', + name: 'processedPage', + component: resolve => require(['@/pages/processedPage/index.vue'], resolve), + meta: { + requireAuth: true, + title: '手机提示页面', + } + }, { path: '*', redirect: '/loginVerify' @@ -2247,8 +2256,8 @@ const routes = [ } }, { - path: '/phoneGrbzhxhStep3', - name: 'phoneGrbzhxhStep3', + path: '/phoneJrbzhxhStep3', + name: 'phoneJrbzhxhStep3', component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step3.vue'), meta: { isBoolean: true, @@ -2257,8 +2266,8 @@ const routes = [ } }, { - path: '/phoneGrbzhxhStep4', - name: 'phoneGrbzhxhStep4', + path: '/phoneJrbzhxhStep4', + name: 'phoneJrbzhxhStep4', component: () => import('@/pages/processCenter/pages/phone/jrbzhxh/step4.vue'), meta: { isBoolean: true,