FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
宋伟佳
2021-08-03 10:15:14 +08:00
parent d5438065f0
commit 303afc61aa
11 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/axios/index.js
+2 -1
View File
@@ -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 : '/'
})
/**
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+1
View File
@@ -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
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+4
View File
@@ -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 => {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+14 -14
View File
@@ -193,20 +193,20 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
<el-card>
<el-form-item prop="dockUserName2" style="margin-bottom: 0">
<h4>会签人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
<!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
<!-- <el-card>-->
<!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
<!-- <h4>会签人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
<!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
<!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card>
src/pages/processCenter/pages/creatProcess/xmpg/step1-3.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpgStep1-3"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step1-4.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "xmpgStep1-4"
};
</script>
<style scoped>
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+1
View File
@@ -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
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+30 -8
View File
@@ -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({
src/router/index.js
+19
View File
@@ -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',
src/sysConfig/index.js
+1 -1
View File
@@ -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'
vue.config.js
+7
View File
@@ -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,