diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 4a4a57122..1e10f3f57 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -630,11 +630,11 @@ export default { }) } break - //项目合规评估流程 + //标准合规评估 case '5' : - if(row.taskInfo === '标准法规部业务经理审批'){ + if(row.taskInfo === '审核(标准法规业务经理)'){ this.$router.push({ - name: 'xmpgStep2', + name: 'bzpgStep2', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -643,9 +643,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '标准评估任务下发'){ + }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){ this.$router.push({ - name: 'xmpgStep3', + name: 'bzpgStep3', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -654,9 +654,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '合规性评估'){ + }else if(row.taskInfo === '任务分发(项目经理)'){ this.$router.push({ - name: 'xmpgStep4', + name: 'bzpgStep4', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -665,9 +665,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '分发责任人审核'){ + }else if(row.taskInfo === '合规评估(专业技术人员)'){ this.$router.push({ - name: 'xmpgStep5', + name: 'bzpgStep5', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -676,9 +676,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '汇总审核'){ + }else if(row.taskInfo === '审核(项目经理)'){ this.$router.push({ - name: 'xmpgStep6', + name: 'bzpgStep6', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -687,9 +687,20 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '标准法规部领导审核'){ + }else if(row.taskInfo === '审定(项目群负责人)'){ this.$router.push({ - name: 'xmpgStep7', + name: 'bzpgStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '批准(标准法规部高级经理)'){ + this.$router.push({ + name: 'bzpgStep8', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index a5a596550..235b1ed63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -453,6 +453,9 @@ export default { _this: this }, res => { this.breakdownList = res.data + this.breakdownList.map(item => { + delete item.termsConditions + }) }) }); }, @@ -545,7 +548,6 @@ export default { }); } if (addFlag) { - this.projectDataList = []; let projectNames = "", projectNumbers = ""; this.selectProjectList.forEach(items => { projectNames += items.projectName; @@ -553,23 +555,16 @@ export default { projectNumbers += items.projectNumber; projectNumbers += ","; }); - this.$set(this.projectDataList, "projectName", projectNames); - this.$set(this.projectDataList, "projectNumber", projectNumbers); - this.$set(this.projectDataList, "managementHostName", this.selectProjectList[0].managementHostName); - this.$set(this.projectDataList, "developmentHostName", this.selectProjectList[0].developmentHostName); - this.$set(this.projectDataList, "categoryName", this.selectProjectList[0].categoryName); - this.$set(this.projectDataList, "projectStatus", this.selectProjectList[0].projectStatus); - this.$set(this.projectDataList, "uname", this.selectProjectList[0].uname); - this.$set(this.projectDataList, "unameId", this.selectProjectList[0].projectManager); this.dataList.push({ - projectName: this.projectDataList.projectName, - projectNumber: this.projectDataList.projectNumber, - managementHostName: this.projectDataList.managementHostName, - developmentHostName: this.projectDataList.developmentHostName, - categoryName: this.projectDataList.categoryName, - projectStatus: this.projectDataList.projectStatus, - uname: this.projectDataList.uname, - unameId: this.projectDataList.unameId, + projectName: projectNames, + projectNumber: projectNumbers, + managementHostName: this.selectProjectList[0].managementHostName, + developmentHostName: this.selectProjectList[0].developmentHostName, + categoryName: this.selectProjectList[0].categoryName, + projectStatus: this.selectProjectList[0].projectStatus, + projectGroup: this.selectProjectList[0].projectGroup, + uname: this.selectProjectList[0].uname, + unameId: this.selectProjectList[0].projectManager, }) } else { this.$message.warning("请勿重复添加数据"); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index 505953b26..b3ec93312 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -79,13 +79,30 @@ +
+
+ + 批量分发落实人 + +
+
+ + + + @@ -153,8 +169,17 @@ prop="zccssrq" align="center" width="160px" - label="在产车实施日期"> - + label="在产车实施日期"/> + + + @@ -267,6 +292,13 @@ 关闭 + + @@ -286,6 +318,8 @@ export default { data(){ return { active: '1', + activeName: 'first', + fileType: '', //条款文件类型 //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, drawerModal: false, @@ -293,17 +327,22 @@ export default { isTransfer: false, isSubmit: false, saveLoading: false, + modalshowflag: false, itermsConditionsFlag: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, commentText: '', drawerTitle: '', + lsIndex: "", itermsConditionsTitle: '', listForm: {}, dataList: [], detailData: [], nodeList: [], + nodeList2: [], + projectTabName: [], + selectProject: [], } }, mounted() { @@ -311,6 +350,15 @@ export default { this.processTable() }, methods: { + handleClick(tab) { + let projectData = this.dataList + this.dataList = [] + projectData.forEach(item => { + if(item.projectName === tab.name){ + this.dataList.push(item) + } + }) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -331,21 +379,34 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) + this.fileType = item.fileType this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm['id'] = item.id - this.listForm.dataList = item.dataList - this.dataList = item.dataList + this.dataList = item.resDats + item.resDats.forEach(item => { + if(!this.projectTabName.includes(item.projectName)){ + this.projectTabName.push(item.projectName) + } + }) + this.listForm.resDats = [] + this.listForm.breakdownList = [] this.dataList.distributePerson = item.dataList[0].distributePerson - this.listForm.breakdownList = item.breakdownList }) }, itermsConditionsClose () { this.itermsConditionsFlag = false }, itermsConditionsOpen (row) { + this.$http.get('SarStandItems/sar-stand-items/findItemById',{ + type:this.fileType, + ids: row.id + },{ + _this: this + }, res => { + this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'') + }) this.itermsConditionsFlag = true - this.itermsConditionsTitle = row.replace(/''/g, '\'') }, //tab发生变化 handleTabs(name) { @@ -368,8 +429,11 @@ export default { }, //提交 handleSubmit(){ + this.dataList.map(item => { + delete item.termsConditions + }) this.listForm.commentText = this.commentText - this.listForm.stepFlag = '0' + this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { @@ -465,6 +529,65 @@ export default { this.detailData = res }, e => {}) }, + selectProjectChange(data){ + this.selectProject = data + }, + choiceZRRS(row, type, index) { + this.type = type; + if (type === 1) { + this.nodeList2 = []; + this.lsIndex = index; + if (row.implementerId) { + this.nodeList2 = row.implementerId.split(","); + } else { + this.nodeList2.push(row); + } + this.modalshowflag = true; + } else if (type === 2) { + // 批量 + if (this.selectProject.length > 0) { + this.nodeList2 = []; + this.modalshowflag = true; + this.selectProject.forEach(item =>{ + if(item.implementerId){ + this.nodeList2 = item.implementerId.split(","); + } + }) + } else { + this.$message.warning("请选择要分发的数据"); + } + } + }, + checkedRole2(data) { + let idList = "",nameList = ""; + data.forEach(item => { + if (nameList.length) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + if (this.type === 1) { + let projectList = JSON.parse(JSON.stringify(this.dataList)) + projectList[this.lsIndex].implementerId = idList; + projectList[this.lsIndex].implementer = nameList; + this.dataList = projectList + } else if (this.type === 2) { + let projectList = JSON.parse(JSON.stringify(this.dataList)) + projectList.forEach(item => { + this.selectProject.forEach(items => { + if (item.projectName === items.projectName && item.itemsNum === items.itemsNum) { + item.implementerId = idList; + item.implementer = nameList; + } + }); + }); + this.dataList = projectList + this.$refs.multipleTable.clearSelection(); + } + this.modalshowflag = false; + }, }, computed: { listNoDataText () { @@ -534,7 +657,7 @@ export default { .tableButton { position: absolute; - right: 0; + left: 0; top: 0; } @@ -548,7 +671,9 @@ export default { } } } - + /deep/.el-tabs__header{ + margin: 0; + } .demo-drawer-content { margin-top: 10px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 60a5fa44d..82d9cc9c1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -1,13 +1,1012 @@ + - diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue new file mode 100644 index 000000000..face62e72 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue new file mode 100644 index 000000000..f5307e9a6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue new file mode 100644 index 000000000..1ad204b53 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 334b7b9c1..e2fc878e5 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -900,9 +900,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '合规性评估'){ + }else if(row.taskInfo === '任务分发(项目经理)'){ this.$router.push({ - name: 'xmpgStep4', + name: 'bzpgStep4', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -911,9 +911,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '分发责任人审核'){ + }else if(row.taskInfo === '合规评估(专业技术人员)'){ this.$router.push({ - name: 'xmpgStep5', + name: 'bzpgStep5', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -922,9 +922,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '汇总审核'){ + }else if(row.taskInfo === '审核(项目经理)'){ this.$router.push({ - name: 'xmpgStep6', + name: 'bzpgStep6', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -933,9 +933,20 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '标准法规部领导审核'){ + }else if(row.taskInfo === '审定(项目群负责人)'){ this.$router.push({ - name: 'xmpgStep7', + name: 'bzpgStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '批准(标准法规部高级经理)'){ + this.$router.push({ + name: 'bzpgStep8', query: { taskIds: row.taskIds, prcId: row.prcId, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 58dff1bd3..685f9298c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1223,6 +1223,31 @@ export default { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } }, + // 上移 事件 + moveUp(index, row) { + if (index === 0) { + this.$message({ + message: '已经是列表中第一个素材!', + type: 'warning' + }) + } else { + let temp = this.sarAccessInfoList[index - 1] + this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, temp) + } + }, + moveDown(index) { + if (index === (this.sarAccessInfoList.length - 1)) { + this.$message({ + message: '已经是列表中最后一个素材!', + type: 'warning' + }) + } else { + let i = this.sarAccessInfoList[index + 1] + this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index]) + this.$set(this.sarAccessInfoList, index, i) + } + }, // 点击清单条目导入按钮事件 importmodalFlags() { this.importmodalFlag = true @@ -2075,7 +2100,7 @@ export default { // 责任部门数据字典 this.zrbmOptions = res.data.ZRBMCLASS // 能源类型数据字典 - this.CycxOptions = res.data.CLLX + this.CycxOptions = res.data.ENERGYTYPES this.categoryOptions = res.data.NYLXCLASS // 能源类型 // 适用车型数据字典 this.applyArcticOptions = res.data.PRODUCTTYPE diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 2f032f270..f1f179093 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -277,10 +277,10 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 - - - - + 企标复审计划 +
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index d9dda2b2c..0e0a09b4f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -21,7 +21,7 @@ clearable > - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @selection-change="handleSelectionChange"> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ + this.$http.get("sys/dictype/getDicTypeListCode", {}, {_this: this}, res => { // this.xmztOptions = res.data.XMZT; this.scxxOptions = res.data.SCXX; this.countryList = res.data.COUNTRY; @@ -955,7 +957,7 @@ export default { } else { this.title = "编辑车型/项目库"; row.targetMarket = row.targetMarket.split(","); - this.localProEO = { ...row }; + this.localProEO = {...row}; // this.localProEO.id = row.id if (this.localProEO.energyKind != null && !(this.localProEO.energyKind instanceof Array)) { if (this.localProEO.energyKind === "") { @@ -1095,8 +1097,8 @@ export default { }, // 清空条件查询 clearAllSearch() { - this.localProTableSearch = { ...this.localProTableSearchDefault }; - this.projectLibrarySearch = { ...this.projectLibrarySearchDefault }; + this.localProTableSearch = {...this.localProTableSearchDefault}; + this.projectLibrarySearch = {...this.projectLibrarySearchDefault}; this.localProTableSearch.page = 1; this.getLocalProductTable(); }, @@ -1337,7 +1339,7 @@ export default { handleProcess(row) { // 项目清单确认流程 this.$router.push({ - name:'xmqdqrStep1-4', + name: 'xmqdqrStep1-4', query: { row } @@ -1402,7 +1404,7 @@ export default { }, // 取消或者关闭弹窗 resetReletionForm() { - this.relationTableSearch = { ...this.relationTableSearchDefault }; + this.relationTableSearch = {...this.relationTableSearchDefault}; // this.$refs['processForm'].clearValidate() this.$refs.RelectionMultipleTable.clearSelection(); this.reletionSelectNum = []; @@ -1432,7 +1434,7 @@ export default { this.$http.get("lawss/sarProductInfo/isOver", { productNo: this.localProEO.productNo, id: this.localProEO.id - }, { _this: this }, res => { + }, {_this: this}, res => { if (res.data) { callback(new Error("项目编号不能重复")); } else { @@ -1564,26 +1566,26 @@ export default { this.localProEO.productManagerShow = userNameList.join(","); }, selectSort() { - solostarData().then(res=>{ - res.data.MaintenanceProjectClassification.forEach((item, index)=>{ + solostarData().then(res => { + res.data.MaintenanceProjectClassification.forEach((item, index) => { this.projectData.push({ label: item, value: index }) }) - res.data.MaintenanceProjectStatus.forEach((item, index)=>{ + res.data.MaintenanceProjectStatus.forEach((item, index) => { this.projectStatus.push({ label: item, value: index }) }) - res.data.notMaintenanceProjectClassification.forEach((item, index)=>{ + res.data.notMaintenanceProjectClassification.forEach((item, index) => { this.notProjectData.push({ label: item, value: index }) }) - res.data.notMaintenanceProjectStatus.forEach((item, index)=>{ + res.data.notMaintenanceProjectStatus.forEach((item, index) => { this.notProjectStatus.push({ label: item, value: index @@ -1614,7 +1616,7 @@ export default { this.ifMaintaince = "Maintenance"; } else { this.ifMaintaince = this.$route.query.tabName; - if(this.ifMaintaince === "notMaintenance"){ + if (this.ifMaintaince === "notMaintenance") { this.localProTableSearch.prodectCode = this.ifMaintaince; } } @@ -1644,6 +1646,7 @@ export default { width: 100%; //height: calc(100% - 110px); height: calc(~'100% - 30px'); + .table_info { height: calc(70vh - 90px); } @@ -1654,7 +1657,7 @@ export default { } /deep/ .pagination { - position:inherit; + position: inherit; //position: unset; } @@ -1668,15 +1671,17 @@ export default { } } } + ///deep/ .el-table--scrollable-x .el-table__body-wrapper { // overflow-x: scroll; //} ///deep/.el-table__fixed { // height: 48px !important; //} -/deep/.el-table .el-table__body-wrapper { +/deep/ .el-table .el-table__body-wrapper { height: 84%; } + ::v-deep .el-drawer__header { & > span:first-child { outline: none !important; diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index af3445f7f..7f0b3b962 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -10,9 +10,15 @@
- 产品平台: {{ localProEO.projectPlatfor }} - 项目编号: {{ localProEO.projectNumber }} - + + 管理主体: {{ localProEO.managementHostName || '-' }} + 开发主体: {{ localProEO.developmentHostName || '-' }} + 项目细分类:{{ localProEO.categoryName || '-' }} + 项目群: {{ localProEO.projectGroup }} + + + 项目编号: {{ localProEO.projectNumber }} +
{{ localProEO.projectName }} @@ -26,21 +32,16 @@
- 项目分类:{{ localProEO.projectClassification }} - + 项目状态: {{ localProEO.projectStatus }} + + 当前节点: {{ localProEO.currentNode }}
- 项目状态: {{ localProEO.projectStatus }} - 项目群: {{ localProEO.projectGroup }} - 当前节点: {{ localProEO.currentNode }} - 项目级别: {{ localProEO.projectLevel }} - - - 产品线: {{ localProEO.productLine }} - 项目经理: {{ localProEO.uname }} - 项目计划开始时间: 产品线: {{ localProEO.productLine }} --> + 项目经理: {{ localProEO.uname }} + 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} - 项目计划完成时间: 项目计划完成时间: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }}
diff --git a/src/router/index.js b/src/router/index.js index b10d95503..2be48c1b8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -565,6 +565,33 @@ const routes = [ title: '标准合规评估流程' } }, + { + path: '/bzpgStep6', + name: 'bzpgStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step6.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/bzpgStep7', + name: 'bzpgStep7', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step7.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/bzpgStep8', + name: 'bzpgStep8', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, { path: '/xmpgStep1', name: 'xmpgStep1',