From e0d0d5457ff36588438c30974cfb30df8ebad06e Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Fri, 28 Apr 2023 19:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/permissionProcess.js | 8 ++++++++ src/utils/request.js | 21 +-------------------- src/views/permissionApplication/launch.vue | 21 ++++++++++++++++++++- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/api/modules/permissionProcess.js b/src/api/modules/permissionProcess.js index d7a7641..8d2bc33 100644 --- a/src/api/modules/permissionProcess.js +++ b/src/api/modules/permissionProcess.js @@ -9,4 +9,12 @@ export default { data: data }) }, + // 查询报告如果已经发起了 就不能再发起了 + selectReport (data) { + return request({ + url: '/api/report/isAct', + method: 'post', + data: data + }) + }, } diff --git a/src/utils/request.js b/src/utils/request.js index 94876e5..ed3413a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -43,25 +43,6 @@ instance.interceptors.response.use(function (response) { store.commit('saveIsLoading', false) } - // 登录超时 - if (response.data.respCode === '401') { - store.commit('saveUserInfo', null) - store.commit('saveUserInfo', null) - store.commit('savePathUrl', null) - store.commit('saveMenuName', null) - store.commit('saveMenuData', null) - router.push('/login') - Message.error('登录超时过期') - //清除vuex - - // var url = 'http://192.168.144.22:9966/login?loginType=1' - // // var url = 'http://10.64.23.30:7766/home' - // - // return window.open('http://192.168.144.29:9090/cas/login?service='+url, '_self'); - // return window.open('https://caddmuat.changan.com.cn/cas/login?service='+url, '_self'); - // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); - } - // 请求成功 if (response.status === 200) { if (response.data.respCode === '0') { @@ -73,7 +54,7 @@ instance.interceptors.response.use(function (response) { store.commit('saveUserInfo', null) store.commit('savePathUrl', null) store.commit('setHandleProcess', null) - router.push('/login') + // router.push('/login') Message.error(response.data.message) // window.open(BASE_URL.BASE_CHANGAN + "/logout?service=" + BASE_URL.BASE_LOCAL + "/login?loginType=1", '_self'); // var url = 'http://192.168.144.22:9966/login?loginType=1' diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 1fda33c..8a54b7f 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -434,7 +434,9 @@ export default { }) } else { - this.startProcess() + this.isSendDraft().then(()=>{ + this.startProcess() + }) } } } else { @@ -447,6 +449,23 @@ export default { //修改参数 changeParam() { + }, + // 草稿发起 需要先调用这个接口 + isSendDraft(){ + let ids=this.tableData.map(item=>{ + return item.reportId + }) + return new Promise((resolve,reject)=>{ + this.$api.permissionProcess.selectReport({ids:ids}).then((res)=>{ + if(res.data.length==0){ + resolve(true) + }else{ + this.$message.warning("报告"+res.data.join(',')+"已经在流程中") + reject() + } + + }) + }) }, startProcess() { //把表单都整合到form中