diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 01799fdb3..09c1e0610 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -116,11 +116,11 @@ // path: '/partCodeApply', // menuId: 'ad9db496772c075f78495382b7581fe9' // }, - // { - // title: '工作组数据统计', - // path: '/dataStatisComments', - // menuId: '' - // }, + { + title: '工作组数据统计', + path: '/dataStatisComments', + menuId: '' + }, { title: '海外法规', path: '/foreignStandardsAndRegulations', @@ -132,11 +132,11 @@ menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, - // { - // title: '国内外政策', - // path: '/foreignRegulationsDatabase', - // menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' - // }, + { + title: '国内外政策', + path: '/foreignRegulationsDatabase', + menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' + }, // // // { // // // title: '标准制修订管理', // // // path: '/demo2One' @@ -182,10 +182,10 @@ path: '/nonConfomity', menuId: '0119abd677e0204e061eb0f0b8cafda0' }, - // { - // title: '工作组', - // path: '/workingGroup', - // }, + { + title: '工作组', + path: '/workingGroup', + }, // { // title: '备案产品标准库', // path: '/enterpriseStandardFiling', @@ -196,11 +196,11 @@ path: '/standInvolveProject', menuId: '8a9c87fe06244fb9d55e78fb281f625b' }, - // { - // title: '企标制修订计划', - // path: '/enterpriseStandardPlan', - // // menuId: '8a9c87fe06244fb9d55e78fb281f625b' - // } + { + title: '企标制修订计划', + path: '/enterpriseStandardPlan', + // menuId: '8a9c87fe06244fb9d55e78fb281f625b' + } // { // title: '动态信息', // path: '/information', @@ -254,7 +254,7 @@ { title: '标准化活动日历', path: '/standCalendar', - menuId: '0ea66e3dd36873082b6851f69e92c8be' + menuId: '' }, // { // title: '标准比对库', @@ -342,11 +342,11 @@ // path: '/convertDocView', // menuId: '3F52K25546' // }, - // { - // title: '菜单管理', - // path: '/menuManage', - // menuId: '87b8b4f5817a7829696e63185c744d52' - // }, + { + title: '菜单管理', + path: '/menuManage', + menuId: '87b8b4f5817a7829696e63185c744d52' + }, { title: '链接管理', path: '/linkManage', diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 490412f1a..7463fc5a6 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -6,16 +6,16 @@ 友情链接
-
- - + + - {{ item.name }} + {{ item.name.slice(0, 8) + '...' }} + {{ item.name }} @@ -25,18 +25,17 @@ - -
-
- - + + + - {{ item.name }} + {{ item.name.slice(0, 8) + '...' }} + {{ item.name }} @@ -46,8 +45,7 @@ - -
+
@@ -61,6 +59,15 @@ import {getImg} from '@/api/linkApi.js' export default { name: 'Empennage', + filters: { + snippet: function (value) { + if (value && value.length > 8) { + return value.slice(0, 8) + '...' + } else { + return value + } + } + }, components: {}, mixins: [], data() { @@ -168,6 +175,7 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index f46729998..964339473 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -18,18 +18,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -78,8 +66,18 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';' }} + + + + - + -
- - 批量删除 - -
+ + +
+ + +
+ +
@@ -277,6 +279,11 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + infoSourcesLength: '', + + textTitle: '审批意见', + textHolder: '请输入审批意见' } }, computed: { @@ -308,6 +315,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师汇总修订完毕') { + this.textTitle = '回执说明' + this.textHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -321,76 +332,60 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, - /** 批量删除 */ - del_paryForm() { - if (this.deleteDataList.length < 1) { - this.$message.warning("请选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - let exits = []; - this.deleteDataList.map(item => { - let index; - index = this.rh_pageData.myPartRole.findIndex(items => { - return items.id === item; - }); - if (index > -1) { - this.rh_pageData.myPartRole.splice(index, 1); - } - exits.push(item); - }); - this.deleteDataList = []; - }).catch(() => { - }); + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, - selectedDelete(val) { this.deleteDataList = val }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - rh_pageData: this.rh_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '标准法规部主管领导审核') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入反馈意见') } else { - json = { + let json = { + passFlag: '0', rh_pageData: this.rh_pageData, roleList: this.roleForm } - } - this.$refs['rh_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.taskInfo === '标准法规部主管领导审核') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } - }) + this.$refs['rh_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 + }); + } + }) + } }, // 提交按钮 @@ -398,6 +393,7 @@ export default { let json = { passFlag: '1', rh_pageData: this.rh_pageData, + commentText: this.textarea, roleList: this.roleForm } if (this.taskInfo === '标准法规部主管领导审核') { @@ -512,6 +508,7 @@ export default { /deep/ .el-table__body-wrapper { height: auto !important; } + .myPart_btn { text-align: right; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 6e269cd45..edf146d99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -97,15 +97,16 @@ - - - + + @@ -170,6 +171,19 @@
+ + +
+ + +
+ +
@@ -319,7 +333,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js' +import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js' export default { components: { @@ -352,10 +366,10 @@ export default { {value: '1', label: '标准法规技术评估流程'}, ], feeKindOptions: [ - { value: '0', label: '列支1' }, - { value: '1', label: '列支2' }, - { value: '2', label: '列支3' }, - { value: '3', label: '列支4' }, + {value: '0', label: '列支1'}, + {value: '1', label: '列支2'}, + {value: '2', label: '列支3'}, + {value: '3', label: '列支4'}, ], /** 上传相关 */ acceptShow: false, @@ -393,6 +407,13 @@ export default { roleShowflagOne: false, isSubmit: false, saveLoading: false, + commentText: '' + } + }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() } }, methods: { @@ -400,11 +421,21 @@ export default { handleTabs(name) { this.active = name }, + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.ch_pageData = mes.ch_pageData + this.commentText = mes.commentText + this.roleForm = mes.roleForm + }); + }, //上传按钮 - /* uploadFile(val) { - this.fileListData = val - },*/ + /* uploadFile(val) { + this.fileListData = val + },*/ // 文件上传限制条件 handleBeforeUpload(file) { var filename = file.name @@ -557,10 +588,12 @@ export default { _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '20') + _formData.append('prcType', '21') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - ch_pageData: this.ch_pageData + ch_pageData: this.ch_pageData, + commentText: this.commentText + })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -577,6 +610,7 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, roleList: this.roleForm, ch_pageData: this.ch_pageData, + commentText: this.commentText, directorList: this.roleForm.dockUser, } this.$refs['ch_pageData'].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index ae2d7683e..ac5a459f5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -59,23 +59,22 @@ - + {{ '-' }} + + {{ item.name }} {{ ';' }} + - {{ ch_pageData.sort || '-'}} + 计划内 + 计划外 - +
- +
+ v-model="commentText">
@@ -201,7 +200,8 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js' +import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js' + export default { components: { ProcessHeader, @@ -217,7 +217,7 @@ export default { ch_pageData: {}, ch_rules: {}, nodeList: [], - textContent: '', + commentText: '', isBack: false, isSubmit: false, @@ -228,6 +228,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + uploadFileLength: '' } }, computed: { @@ -269,38 +270,44 @@ export default { this.getFormFieldList(processForm) }) }, - getFormFieldList (item) { + getFormFieldList(item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, // 退回按钮 handleSubmitNo() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '0', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_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 = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '0', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_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() { @@ -308,7 +315,7 @@ export default { roleList: this.roleForm, memberId: this.$store.getters.userInfo.userId, passFlag: '1', - commentText: this.textContent, + commentText: this.commentText, ch_pageData: this.ch_pageData, } this.$refs['ch_pageData'].validate((valid) => { @@ -327,6 +334,7 @@ export default { }); } }) + } } } @@ -334,15 +342,18 @@ export default { + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index 105a1410d..4a5d3fb91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -20,64 +20,64 @@ - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - - + + {{ '-' }} + + {{ item.name }} {{ ';' }} + - - {{ ch_pageData.sort || '-' }} + + 计划内 + 计划外 - + - +
+ + +
+ + +
+ +
@@ -201,7 +214,8 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js' +import {startProcess, saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js' + export default { components: { ProcessHeader, @@ -230,6 +244,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '审批意见', + passHolder: '请输入审批意见' } }, computed: { @@ -261,6 +279,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师修订完毕') { + this.passTitle = '回执说明', + this.passHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -270,9 +292,10 @@ export default { this.getFormFieldList(processForm) }) }, - getFormFieldList (item) { + getFormFieldList(item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -293,7 +316,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.ch_pageData.myPartRole.splice(index, 1); @@ -311,46 +334,53 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '0', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_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.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_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() { let json = { passFlag: '1', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } if (this.taskInfo === '技术管理中心主任审批') { @@ -363,6 +393,7 @@ export default { } else { json = { ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } } @@ -382,6 +413,7 @@ export default { }); } }) + } } } @@ -389,15 +421,18 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue new file mode 100644 index 000000000..1acc953ba --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -0,0 +1,2713 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 33ecbeebf..7a653f206 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -305,7 +305,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, @@ -336,6 +336,7 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafter = this.selectList[0].drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 306985a27..2c1a0851c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -327,7 +327,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, @@ -358,6 +358,7 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafter = this.selectList[0].drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index e21492e45..d8fa3bc70 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -1,91 +1,109 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index cc5897e1e..d55961518 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -3,86 +3,48 @@ - - - - - 根据企标编号、名称查询 - - - - - - - - - - - - - - - 根据企标编号、名称、类别查询 - - - - - - - - - - - - - - - -
+ + + + 根据企标编号、名称查询 + + + + + + + + + + + + + + + 根据企标编号、名称、类别查询 + + + + + + + + + + + + + + + @@ -106,11 +68,10 @@ - + + + - + + + @@ -137,18 +102,15 @@ - + + + - + + 带入
+ + +
@@ -310,6 +286,14 @@ export default { props: ['message'], data(){ return { + drawerTitle2: '', + drawerTitle: '', + type: '', + modalshowflag2: false, + modalshowflag: false, + nodeList2: [], + nodeList: [], + qcdwOptions: [], standShow: false, standShow2: false, ListModel: false, @@ -319,7 +303,44 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, selectList: [], - formRules: {}, + qbfsFormRules: { + esName1: [ + {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, + ], + esName2: [ + {required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, + ], + unit: [ + {required: true, message: '请输入单位', trigger: 'blur'}, + ], + esName: [ + {required: true, message: '请输入企标名称', trigger: 'blur'}, + ], + planStatus: [ + {required: true, message: '请选择计划状态', trigger: 'change'}, + ], + reviseStatus: [ + {required: true, message: '请选择制修订状态', trigger: 'change'}, + ], + resPerson: [ + {required: true, message: '请输入评审责任人', trigger: 'blur'}, + ], + wgLeader: [ + {required: true, message: '请输入工作组组长', trigger: 'blur'}, + ], + draftTime: [ + {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, + ], + releaseTime: [ + {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, + ], + drafter: [ + {required: true, message: '请输入起草人', trigger: 'blur'}, + ], + mergeReason: [ + {required: true, message: '请输入合并原因', trigger: 'blur'}, + ], + }, standinfoList: [], standardSearch: { reviseStatus: "", @@ -334,6 +355,9 @@ export default { isSubTime: "", mergeReason: "", company: "", + resPersonName: '', + drafterName: '', + wgLeaderName:'', groupLeader: "", drafterPeople: "", formulateStatus: "", @@ -357,21 +381,16 @@ export default { reviewDate: '', abolishCause:'', }, - qbzxdForm2: { - standCode: "", - standName: "", - enName: '', - entCategory: '', - replaceNumber: '', - replacedNumber: '', - releaseDate: '', - implementDate: '', - reviewDate: '', - abolishCause:'', - }, } }, mounted() { + //查询下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + console.log(res); + this.qcdwOptions = res.data.QCDW // 起草单位 + }) this.getStandDataBtn() }, @@ -385,6 +404,52 @@ export default { } }, methods: { + choiceZRR() { + this.nodeList = []; + this.drawerTitle = '请选择工作组组长'; + this.modalshowflag = true; + }, + checkedRole(data) { + this.qbfsForm.wgLeader = data[0].id; + this.qbfsForm.wgLeaderName = data[0].name; + this.modalshowflag = false; + }, + choiceZRRS(type) { + this.type = type + if(type === '1' ){ + this.drawerTitle2 = '请选择起草人' + this.nodeList2 = []; + if (this.qbfsForm.drafter !== undefined) { + this.nodeList2 = this.qbfsForm.drafter.split(","); + } + }else if(type === '2'){ + this.drawerTitle2 = '请选择评审责任人' + this.nodeList2 = []; + if (this.qbfsForm.resPerson !== undefined) { + this.nodeList2 = this.qbfsForm.resPerson.split(","); + } + } + this.modalshowflag2 = true; + }, + checkedRole2(data) { + var idList = ""; + var nameList = ""; + data.forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + if(this.type === '1'){ + this.qbfsForm.drafter = idList; + this.qbfsForm.drafterName = nameList; + }else if(this.type === '2'){ + this.qbfsForm.resPerson = idList; + this.qbfsForm.resPersonName = nameList; + } + }, validateForm () { let flag = null this.$refs['qbfsForm'].validate((valid) => { @@ -418,14 +483,16 @@ export default { this.$message.warning('请至少选择一条数据进行带入') }else{ if(this.showType === 'one'){ - this.qbzxdForm.esName = this.selectList[0].esName || '--' - this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--' - this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--' + this.qbfsForm.esId1 = this.selectList[0].id || '--' + this.qbfsForm.esName1 = this.selectList[0].esName || '--' + this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--' + this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--' this.standShow = true }else{ - this.qbzxdForm2.esName = this.selectList[0].esName || '--' - this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--' - this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--' + this.qbfsForm.esId2 = this.selectList[0].id || '--' + this.qbfsForm.esName2 = this.selectList[0].esName || '--' + this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--' + this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' this.standShow2 = true } this.ListModel = false @@ -434,7 +501,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index cfb23dd2a..725f7bce6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -315,7 +315,7 @@ export default { //企业标准查询 getStandDataBtn(){ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ - reviseStatus: this.standardSearch.reviseStatus, + reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, page: this.page, pageSize: this.pageSize, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 2df447bac..d4a9a3e8a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -268,6 +268,7 @@ export default { }, data() { return { + comFlag: 0, active: "1", commentText: "", comName: "merge", @@ -414,22 +415,71 @@ export default { this.saveLoading = false }) }, + repeatName(){ + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, { + _this: this + }, res => { + let dataList = res.data + dataList.forEach(item => { + if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){ + this.comFlag++ + }else{ + this.comFlag = 0 + } + }) + }) + }, //流程提交 handleSubmit() { - if (this.$route.query.prcNum === undefined) { - let flag = this.$refs["childForm"].validateForm(); - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - if (flag) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - var json = Object.assign(qbzxdFrom, this.roleForm); - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { - _this: this - }, res => { - if (res.ok) { + this.repeatName() + if(this.comFlag === '0'){ + this.$message.warning('请更改企标名称') + }else { + if (this.$route.query.prcNum === undefined) { + let flag = this.$refs["childForm"].validateForm(); + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + if (flag) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = Object.assign(qbzxdFrom, this.roleForm); + this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } + }); + } + }); + } else { + this.$message.warning("请完善人员信息"); + } + }); + } else { + this.$message.warning("请完善基础信息"); + } + } else { + let flag = this.$refs["childForm"].validateForm(); + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + if (flag) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, + taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, json: JSON.stringify(json) }, { @@ -441,46 +491,15 @@ export default { this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); + } else { + this.$message.warning("请完善人员信息"); } }); } else { - this.$message.warning("请完善人员信息"); + this.$message.warning("请完善基础信息"); } - }); - } else { - this.$message.warning("请完善基础信息"); + } } - } else { - let flag = this.$refs["childForm"].validateForm(); - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - if (flag) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - var json = Object.assign(qbzxdFrom, this.roleForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.isSubmit = false; - this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); - } - }); - } else { - this.$message.warning("请完善人员信息"); - } - }); - } else { - this.$message.warning("请完善基础信息"); - } - } - - }, // 流程阶段负责人选择 choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 9309fe961..e479a69a8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -36,21 +36,21 @@ - + - + - +
- +
{ - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.qbfsForm.passFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, - }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 1ecb8b369..57e57c3f0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -148,7 +148,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.qbfsForm.deptCenterFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, - }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 9a3df7276..7fd695344 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -148,7 +148,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.qbfsForm.bzFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index d23f72d5a..903dbd509 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -148,7 +148,7 @@
- +
{ - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.isSubmit = true + this.qbfsForm.bzfgbzFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index ef1f9f7ae..00a810200 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -702,12 +702,12 @@ export default { standNumber: '', //标准编号 standCode: '', //企标编号 dataSource: 'INLAND', + standType: 'INLAND', lawNumber: '', // 标准编号/政策编号 lawName: '', // 标准名称/政策名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', quoteIdList: '', validFlag: '0', menuId: 'nomenu' @@ -1094,6 +1094,7 @@ export default { }, //添加标准的查询按钮 searchLawBtn(){ + console.log(this.handleSelectForm); this.lawInfoTableLoading = true if (this.handleSelectForm.dataSource === 'INLAND'){ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 0072b8b4c..f886ef95e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -721,7 +721,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', + standType: 'INLAND', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 376574cb6..611fd5c46 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -705,7 +705,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', + standType: 'INLAND', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue index c65b895c7..28f3d1d1f 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue @@ -1092,7 +1092,6 @@ _this: this }, res => { if (res.success) { - debugger if(this.formTongGuo.approvalOpinion === '1'){ this.$message.warning("驳回成功") this.isSubmit = false diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 5ac7ce987..6ca2b5806 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -16,9 +16,9 @@
- - - + + +
@@ -30,382 +30,253 @@
-
标准调研流程
+
参与外部标准制修订信息提报流程
- + -
+
-
标准征求意见流程
+
外部标准化协会入会流程
- + -
+
-
标准清单发布/更新流程
+
外部标准化协会参会流程
- + -
+
-
标准合规评估流程
+
政策征求意见流程
+ + +
- + -
+
-
未符合项整改流程
+
重点认证标准/政策合规性项目审查流程
+ + +
- + -
+
-
标准解读流程
+
企标制修订流程及企业标准库流程
- + -
+
-
项目合规评估流程-项目
+
企标复审流程
- + -
+
-
项目清单确认流程
+
企标废止流程
+
+
+
+
+ + + + +
+
+
+ +
+
+
企标制修订计划管控
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 081dd1ae8..586eed8cc 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -258,6 +258,12 @@ export default { }else if(prcType === '10'){ //项目清单确认 this.toProcessDetail('xmqdqrStep1-3',row) + } else if(prcType === '20') { + // 入会流程 + this.toProcessDetail('bzrhStep6-1',row) + } else if(prcType === '21') { + // 参会流程 + this.toProcessDetail('bzchStep6-1',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 84c472269..11f67461c 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -318,6 +318,152 @@ export default { }) } break + case 'buss1': + if (row.taskInfo === '企标编写') { + this.$router.push({ + name: 'bussLibrary2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '企标汇总修订'){ + this.$router.push({ + name: 'bzrkStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准化员审批'){ + this.$router.push({ + name: 'bzrkStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '重新企标汇总修订'){ + this.$router.push({ + name: 'bzrkStepC3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '会签征求意见'){ + this.$router.push({ + name: 'bzrkStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '主起草人修订并组织评审'){ + this.$router.push({ + name: 'bzrkStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规工程师复审'){ + this.$router.push({ + name: 'bzrkStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '重新修订并组织评审'){ + this.$router.push({ + name: 'bzrkStepC6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '技术委员会负责人/起草中心主任审核'){ + this.$router.push({ + name: 'bzrkStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规部部长审核'){ + this.$router.push({ + name: 'bzrkStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '专委会副主任/起草单位中心主任审定'){ + this.$router.push({ + name: 'bzrkStep10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '专委会主任/总院院长或主管副院长批准'){ + this.$router.push({ + name: 'bzrkStep11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '主起草人培训'){ + this.$router.push({ + name: 'bzrkStep12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break case 'laws1': if (row.taskInfo === '政策入库审批') { this.$router.push({ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 30298c95b..e6c26d318 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -195,8 +195,8 @@ :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange"> + diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue index 9a2d65b9d..5c27786fe 100644 --- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue +++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue @@ -146,7 +146,6 @@ @click="clearSearch" > - @@ -101,27 +101,33 @@ label="计划状态" align="center" width="150"> + + @@ -180,7 +186,7 @@
@@ -199,38 +205,38 @@ - - - + + + - - - + + + + + + - +
+ + + + +
+ + +
+
+ 手动查找 +
+
- - - - - - @@ -285,6 +306,40 @@ @click="addDrawerClose">取消
+ + + + + + + +
+ 确认 + +
+
@@ -295,6 +350,15 @@ components: {}, data() { return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], + type: '', + drawerTitle: '', + modalshowflag2: false, + modalshowflag: false, + nodeList: [], + nodeList2: [], loading: false, submitLoading: false, addDrawerTitle: '', @@ -307,10 +371,13 @@ planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 resPerson: '', // 评审责任人 + resPersonName: '', wgLeader: '', // 工作组组长 + wgLeaderName: '', draftTime: '', // 计划标准初稿完成时间 releaseTime: '', // 计划标准发布时间 drafter: '', // 起草人 + drafterName: '', // remarks: '', // 备注 }, addFormRules: { @@ -327,19 +394,19 @@ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], resPerson: [ - {required: true, message: '请输入评审责任人', trigger: 'blur'}, + {required: true, message: '请选择评审责任人', trigger: 'change'}, ], wgLeader: [ - {required: true, message: '请输入工作组组长', trigger: 'blur'}, + {required: true, message: '请选择工作组组长', trigger: 'change'}, ], draftTime: [ - {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, + {required: true, message: '请输入计划标准初稿完成时间', trigger: 'change'}, ], releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], drafter: [ - {required: true, message: '请输入起草人', trigger: 'blur'}, + {required: true, message: '请选择起草人', trigger: 'change'}, ], }, form: { @@ -358,6 +425,59 @@ props: {}, watch: {}, methods: { + QCDWOK () { + let arr1 = [] + if (this.addForm.unit) { + let str = this.addForm.unit.replace(/，/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.addForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + checkedRole (data) { + this.addForm.wgLeader = data[0].id + this.addForm.wgLeaderName = data[0].name + }, + choiceZRRS (type, title, id) { + this.type = type + this.drawerTitle = title + this.nodeList2 = [] + if (id) { + this.nodeList2 = id.split(',') + } + this.modalshowflag2 = true + }, + checkedRole2 (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if (this.type === 'resPerson') { + this.addForm.resPerson = idList + this.addForm.resPersonName = nameList + } else if (this.type === 'drafter') { + this.addForm.drafter = idList + this.addForm.drafterName = nameList + } + }, addDrawerSubmit () { this.$refs['addForm'].validate((valid) => { if (valid) { @@ -376,9 +496,15 @@ }, res => { this.submitLoading = false if (res.ok) { - this.addDrawer = false - this.$message.success(tips + '成功') - this.getData() + if (res.data === '操作成功') { + this.addDrawer = false + this.$message.success(tips + '成功') + this.getData() + } else { + this.addDrawer = false + this.$message.warning(res.data) + this.getData() + } } else { this.$message.warning(tips + '失败') } @@ -473,9 +599,12 @@ reviseStatus: command[0].reviseStatus, // 制修订状态 resPerson: command[0].resPerson, // 评审责任人 wgLeader: command[0].wgLeader, // 工作组组长 + resPersonName: command[0].resPersonName, // 评审责任人 + wgLeaderName: command[0].wgLeaderName, // 工作组组长 draftTime: command[0].draftTime, // 计划标准初稿完成时间 releaseTime: command[0].releaseTime, // 计划标准发布时间 - drafter: command[0].drafter, // 起草人 + drafterName: command[0].drafterName, // 起草人 + drafter: command[0].drafter, } break case '删除': @@ -525,6 +654,12 @@ computed: {}, mounted() { this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.QCDWList = res.data.QCDW // 起草单位 + }, e => { + }) }, } diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 6a155f2ee..36545c4c5 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -181,8 +181,8 @@ fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange" > + + diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 64976940d..fe11fec51 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1120,7 +1120,7 @@ export default { this.roleShowflag = true }, drawerCheck(data) { - this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('(')) + this.addForm.dutyEngineer = data[0].name this.roleShowflag = false }, /** 选择认证工程师和质量工程师 */ @@ -1140,7 +1140,7 @@ export default { idList += ',' } idList += item.id - nameList += item.name.slice(0,item.name.indexOf('(')) + nameList += item.name }) if (this.type === 'authEngineer') { this.addForm.authEngineer = nameList diff --git a/src/router/index.js b/src/router/index.js index 430af915a..312f8af3b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -925,6 +925,121 @@ const routes = [ title: '政策入库流程' } }, + { + path: '/bussLibrary1', + name: 'bussLibrary1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { + path: '/bussLibrary2', + name: 'bussLibrary2', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.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: '/bzdyStep1', name: 'bzdyStep1', @@ -1631,6 +1746,15 @@ const routes = [ title: '外部标准化协会入会流程（审批)' } }, + { + path: '/bzrhStep6-1', + name: 'bzrhStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程' + } + }, // 外部标准化协会参会流程 { @@ -1687,6 +1811,15 @@ const routes = [ title: '外部标准化协会参会流程（审定）' } }, + { + path: '/bzchStep6-1', + name: 'bzchStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程' + } + }, { path: '/bzhhStep1', name: 'bzhhStep1',