diff --git a/src/common/axios/index.js b/src/common/axios/index.js index c069080f4..da73cb853 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -7,10 +7,11 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' +import { serverUrl } from '@/sysConfig' export const CancelToken = axios.CancelToken // import 'element-ui/lib/theme-chalk/index.css' const _axios = axios.create({ - baseURL: 'http://62.234.136.153:8033/' + baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/' }) /** diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 7e0edac2e..da6e5b796 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1034,6 +1034,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append("json", JSON.stringify({ + taskInfo: '引入法规标准清单', form: this.listForm, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index e9af56dc0..ade22d84d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -659,8 +659,12 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append("json", JSON.stringify({ + taskInfo: '根据会签意见修订', form: this.listForm, roleForm: this.roleForm, + prcNum: this.$route.query.prcNum, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, commentText: this.commentText })); saveTaskFirst(_formData).then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 03351cc87..1fad32ba3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -193,20 +193,20 @@ - - - -

会签人

-
- - - -
-
-
-
+ + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue new file mode 100644 index 000000000..4caae637d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue new file mode 100644 index 000000000..8366e5eb4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 07ed68194..ad7e4df9d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -633,6 +633,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("prcType", "5"); _formData.append("json", JSON.stringify({ + taskInfo: '选择已拆分标准', form: this.listForm, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index fb39c7d87..bd68b0c25 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -284,14 +284,36 @@ export default { } break case '5': - this.$router.push({ - name: 'xmpgStep1-1', - query: { - type: '5', - processName: '项目合规评估流程-标准', - bpnId: id - } - }) + if (mes.taskInfo === '选择已拆分标准') { + this.$router.push({ + name: 'xmpgStep1-1', + query: { + type: '5', + processName: '项目合规评估流程-标准', + bpnId: id, + verifySarStandard: true, + } + }) + } + // else if (mes.taskInfo === '分发责任人分发任务') { + // this.$router.push({ + // name: 'bzqdfbStep1-3', + // query: { + // type: '5', + // processName: '项目合规评估流程-标准', + // bpnId: id + // } + // }) + // }else if (mes.taskInfo === '责任人填写评估反馈') { + // this.$router.push({ + // name: 'bzqdfbStep1-3', + // query: { + // type: '5', + // processName: '项目合规评估流程-标准', + // bpnId: id + // } + // }) + // } break case '6': this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index 4a5e76c2d..9b3ba16fc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -303,6 +303,7 @@ const routes = [ title: '项目合规评估流程' } }, + //流程保存界面 { path: '/xmpgStep1-1', name: 'xmpgStep1-1', @@ -312,6 +313,24 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpgStep1-3', + name: 'xmpgStep1-3', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程' + } + }, + { + path: '/xmpgStep1-4', + name: 'xmpgStep1-4', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/xmpgStep2', name: 'xmpgStep2', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 9acd87737..45ab928d4 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = '10.96.10.207' +const devIp = '10.96.170.156' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' diff --git a/vue.config.js b/vue.config.js index ae56c600c..dcab907a6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -78,6 +78,13 @@ module.exports = { devServer: { port: 9999, proxy: { + '/api': { + target: interfaceUrl, + changeOrigin: true, + pathRewrite: { + '^/api': '' + } + }, '/onlyOffice': { target: 'http://10.96.10.171', changeOrigin: true,