Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -21,6 +21,10 @@ export default {
|
||||
label: "政策入库流程",
|
||||
value: "laws1"
|
||||
},
|
||||
{
|
||||
label: "企标制修订流程及企业标准库流程",
|
||||
value: "buss1"
|
||||
},
|
||||
{
|
||||
label: "标准征求意见流程",
|
||||
value: "3"
|
||||
|
||||
@@ -79,7 +79,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="material" label="资料" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
|
||||
<el-button v-if="scope.row.material.length === 0" type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
|
||||
<el-button v-else type="primary" size="mini" @click="uploadTable(scope.row)">查看附件</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -97,7 +98,8 @@
|
||||
<el-table-column label="议题" align="center" prop="meetingTheme"/>
|
||||
<el-table-column label="资料" align="center" prop="meetingFile" width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
|
||||
<el-button v-if="scope.row.meetingFile.length === 0" type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
|
||||
<el-button v-else type="primary" size="mini" @click="uploadThemeTable(scope.row)">查看附件</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -603,7 +605,7 @@ export default {
|
||||
handleSubmit() {
|
||||
let json = {
|
||||
hh_pageData: this.hh_pageData,
|
||||
// director: this.roleForm.engineerUserId,
|
||||
director: this.roleForm.engineerUserId,
|
||||
}
|
||||
this.$refs['hh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="回执说明">
|
||||
<el-collapse-item title="审批意见">
|
||||
<div style="margin: 10px 0;">
|
||||
<el-input
|
||||
type="textarea"
|
||||
@@ -317,7 +317,7 @@ export default {
|
||||
},
|
||||
/** 议题列表查看按钮 */
|
||||
meetingFileBtn(val) {
|
||||
this.themeFileList = val.material
|
||||
this.themeFileList = val.meetingFile
|
||||
this.meetingFileDialog = true
|
||||
},
|
||||
handleClose() {
|
||||
@@ -348,27 +348,31 @@ export default {
|
||||
|
||||
// 退回按钮
|
||||
handleSubmitNo() {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
commentText: this.commentText,
|
||||
hh_pageData: this.hh_pageData,
|
||||
}
|
||||
this.$refs['hh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
if (this.commentText === '') {
|
||||
this.$message.warning('请输入审批意见')
|
||||
} else {
|
||||
let json = {
|
||||
passFlag: '0',
|
||||
commentText: this.commentText,
|
||||
hh_pageData: this.hh_pageData,
|
||||
}
|
||||
})
|
||||
this.$refs['hh_pageData'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isBack = true
|
||||
const params = new FormData();
|
||||
params.set('json', JSON.stringify(json))
|
||||
params.set('userId', this.$store.getters.userInfo.userId)
|
||||
params.set('taskId', this.taskIds)
|
||||
completeTask(params).then(res => {
|
||||
if (res.success === true) {
|
||||
this.$message.success('退回成功')
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isBack = false
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
// 提交按钮
|
||||
handleSubmit() {
|
||||
|
||||
@@ -1697,6 +1697,11 @@
|
||||
let mes = JSON.parse(res.mes)
|
||||
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
|
||||
this.form = mes.form
|
||||
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
|
||||
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
|
||||
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
|
||||
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
|
||||
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
|
||||
this.roleForm = mes.roleForm
|
||||
this.commentText = mes.commentText
|
||||
})
|
||||
@@ -2498,16 +2503,10 @@
|
||||
// _formData.append('id', this.bpnId)
|
||||
_formData.append('createUser', this.$store.getters.userInfo.userId)
|
||||
_formData.append('createUserName', this.$store.getters.userInfo.uName)
|
||||
_formData.append('prcType', 'laws1')
|
||||
_formData.append('prcName', '政策入库流程')
|
||||
_formData.append('prcType', 'buss1')
|
||||
_formData.append('prcName', '企标制修订流程及企业标准库流程')
|
||||
_formData.append('json', JSON.stringify({
|
||||
// prcForm: this.prcForm,
|
||||
// sarAccessInfoList: this.sarAccessInfoList,
|
||||
// sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
|
||||
// bzqdForm: this.bzqdForm,
|
||||
// listInfo: this.listInfo,
|
||||
// id: this.id
|
||||
taskInfo: '申请人发起',
|
||||
taskInfo: '发起企标制修订流程',
|
||||
form: this.form,
|
||||
roleForm: this.roleForm,
|
||||
commentText: this.commentText
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -227,6 +227,12 @@ export default {
|
||||
if (prcType === '1') {
|
||||
// 标准入库流程数据
|
||||
this.toProcessDetail('bzrkStep5',row)
|
||||
}else if(prcType === 'laws1'){
|
||||
//政策入库
|
||||
this.toProcessDetail('zcrkStep5',row)
|
||||
}else if(prcType === 'buss1'){
|
||||
//企标入库
|
||||
this.toProcessDetail('bussLibraryDetail',row)
|
||||
}else if(prcType === '4'){
|
||||
//标准清单发布流程数据
|
||||
this.toProcessDetail('bzqdfbStep1-4',row)
|
||||
|
||||
+105
-97
@@ -943,103 +943,111 @@ const routes = [
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},
|
||||
// {
|
||||
// path: '/bussLibrary3',
|
||||
// name: 'bussLibrary3',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibraryC3',
|
||||
// name: 'bussLibraryC3',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary4',
|
||||
// name: 'bussLibrary4',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary5',
|
||||
// name: 'bussLibrary5',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary6',
|
||||
// name: 'bussLibrary6',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibraryC6',
|
||||
// name: 'bussLibraryC6',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary7',
|
||||
// name: 'bussLibrary7',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary8',
|
||||
// name: 'bussLibrary8',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary9',
|
||||
// name: 'bussLibrary9',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary10',
|
||||
// name: 'bussLibrary10',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary11',
|
||||
// name: 'bussLibrary11',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },{
|
||||
// path: '/bussLibrary12',
|
||||
// name: 'bussLibrary12',
|
||||
// component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'),
|
||||
// meta: {
|
||||
// requireAuth: true,
|
||||
// title: '企标制修订流程及企业标准库流程'
|
||||
// }
|
||||
// },
|
||||
{
|
||||
path: '/bussLibrary3',
|
||||
name: 'bussLibrary3',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibraryC3',
|
||||
name: 'bussLibraryC3',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary4',
|
||||
name: 'bussLibrary4',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary5',
|
||||
name: 'bussLibrary5',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary6',
|
||||
name: 'bussLibrary6',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibraryC6',
|
||||
name: 'bussLibraryC6',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary7',
|
||||
name: 'bussLibrary7',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary8',
|
||||
name: 'bussLibrary8',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary9',
|
||||
name: 'bussLibrary9',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary10',
|
||||
name: 'bussLibrary10',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary11',
|
||||
name: 'bussLibrary11',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibrary12',
|
||||
name: 'bussLibrary12',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},{
|
||||
path: '/bussLibraryDetail',
|
||||
name: 'bussLibraryDetail',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '企标制修订流程及企业标准库流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzdyStep1',
|
||||
name: 'bzdyStep1',
|
||||
|
||||
Reference in New Issue
Block a user