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/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index e0cb7145e..e6ec3219a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -445,7 +445,8 @@ { if(!item.distributePerson || !item.projectGroupPeople){ this.$message.warning('请填写完整的人员信息') - }else{ + }else { this.isSubmit = true; - this.listForm.dataList = this.dataList + this.listForm.dataList = this.dataList; this.listForm.commentText = this.commentText; let json = Object.assign(this.listForm, this.roleForm); console.log(json); @@ -837,7 +829,7 @@ export default { this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, - type: '5', + type: "5", json: JSON.stringify({ taskInfo: "选择已拆分标准", form: this.listForm, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index 9ead05378..235b1ed63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -1,4 +1,4 @@ - + @@ -341,7 +358,7 @@ import ProcessHeader from "process/components/ProcessHeader"; import ProcessFooter from "process/components/ProcessFooter"; import ProcessTitle from "process/components/ProcessTitle"; -import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "bzpgStep3", @@ -352,7 +369,7 @@ export default { }, data(){ return { - active: '1', + active: "1", //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, drawerModal: false, @@ -360,33 +377,49 @@ export default { isTransfer: false, isSubmit: false, saveLoading: false, - ProjectModel: false, + projectModel: false, + modalshowflag: false, pageNo: 1, totalNo: 0, pageSizeNo: this.$store.getters.userInfo.configContent, - userId:this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - commentText: '', - drawerTitle: '', - projectGroup: '', //用来查询项目 + commentText: "", + drawerTitle: "", + projectGroup: "", //用来查询项目 listForm: {}, dataList: [], + projectDataList: [], + breakdownList: [], //标准下的分解单数据 detailData: [], nodeList: [], + nodeList2: [], selectProjectList: [], selectProjectGroupList: [], productData: [], //项目群下的项目 projectStatus: [], //项目状态下拉框 projectSearch: { - projectStatus: "", //项目状态 - }, + projectStatus: "" //项目状态 + } } }, mounted() { - this.getData() - this.processTable() - this.getProductData() + this.getData(); + this.processTable(); + this.getProductData(); + /** + * 获取项目群筛选项的值 + */ + this.$http.post("sarStandProjectLibrary/querySelect", {}, { + _this: this + }, res => { + res.data.statusList.forEach(item => { + if (item) { + this.projectStatus.push(item); //项目状态 + } + }); + }); }, methods: { getData() { @@ -406,22 +439,40 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - 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.projectGroup = item.dataList[0].projectGroup - this.dataList.distributePerson = item.dataList[0].distributePerson - this.listForm.breakdownList = item.breakdownList - }) + this.listForm = JSON.parse(JSON.stringify(item)); + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.projectGroup = item.dataList[0].projectGroup; + this.$http.get('SarStandItems/sar-stand-items/findAllItems', { + ids: item.standId, + type: item.fileType + },{ + _this: this + }, res => { + this.breakdownList = res.data + this.breakdownList.map(item => { + delete item.termsConditions + }) + }) + }); + }, + choiceZRRS(row, type, index) { + this.nodeList2 = []; + this.lsIndex = index; + this.lsType = type; + if (row.unameId) { + this.nodeList2 = row.unameId.split(","); + } else { + this.nodeList2.push(row); + } + this.modalshowflag = true; }, //查询项目群下的项目 - getProductData(){ - this.$http.get('sarStandProjectLibrary/queryProjects',{ + getProductData() { + this.$http.get("sarStandProjectLibrary/queryProjects", { projectGroup: this.projectGroup, current: this.pageNo, PageSize: this.pageSizeNo, @@ -429,9 +480,9 @@ export default { }, { _this: this }, res => { - this.productData = res.data.records - this.totalNo = res.data.count - }) + this.productData = res.data.records; + this.totalNo = res.data.count; + }); }, //查询项目按钮 getProductDataBtn(){ @@ -463,31 +514,77 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { - + this.selectProjectGroupList.map(item => { + let index; + index = this.dataList.findIndex(items => { + return items.projectNumber === item.projectNumber; + }); + if (index > -1) { + this.dataList.splice(index, 1); + } + }); + this.selectProjectGroupList = []; + this.$refs.selection.clearSelection(); }).catch(() => { }); } }, - cancelStand(){ - this.projectModel = false + cancelStand() { + this.projectModel = false; }, - okProject(){ - if(this.selectProjectList.length){ - - }else{ - this.$message.warning('请至少选择一条数据进行添加') - } + okProject() { + if (this.selectProjectList.length) { + let addFlag = true; + let projectNumbers = ""; + this.selectProjectList.forEach(item => { + projectNumbers += item.projectNumber; + projectNumbers += ","; + }); + if(this.dataList.length){ + this.dataList.forEach(item => { + if (item.projectNumber === projectNumbers) { + addFlag = false; + } + }); + } + if (addFlag) { + let projectNames = "", projectNumbers = ""; + this.selectProjectList.forEach(items => { + projectNames += items.projectName; + projectNames += ","; + projectNumbers += items.projectNumber; + projectNumbers += ","; + }); + this.dataList.push({ + 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("请勿重复添加数据"); + } + this.projectModel = false; + this.$refs.projectTable.clearSelection(); + } else { + this.$message.warning("请至少选择一条数据进行添加"); + } }, - selectProject(data){ - this.selectProjectList = data + selectProject(data) { + this.selectProjectList = data; }, - pageChangeNo(page){ - this.pageNo = page - this.getProductData() + pageChangeNo(page) { + this.pageNo = page; + this.getProductData(); }, - pageSizeChangeNo(pageSize){ - this.pageSizeNo = pageSize - this.getProductData() + pageSizeChangeNo(pageSize) { + this.pageSizeNo = pageSize; + this.getProductData(); }, //tab发生变化 handleTabs(name) { @@ -495,7 +592,7 @@ export default { }, //折叠/展开基础信息方法 foldForm() { - this.foldFormFlag = !this.foldFormFlag + this.foldFormFlag = !this.foldFormFlag; }, // 点击查看 handlePreview(item) { @@ -509,28 +606,74 @@ export default { window.open(routeUrl.href, "_blank"); }, //提交 - handleSubmit(){ + handleSubmit() { + if (!this.dataList.length) { + this.$message.warning("请添加项目数据"); + } else if(this.dataList.length > 5) { + this.$message.warning('您最多只能选择五条数据') + }else{ + this.listForm.dataList = this.dataList; + this.listForm.breakdownList = this.breakdownList + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.isSubmit = true; + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } }, - //驳回 - beforeBack(){ - + //保存 + handleSave() { + this.saveLoading = true; + this.listForm.dataList = this.dataList; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "5"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, + checkedRole2(data) { + this.dataList[this.lsIndex].unameId = data[0].id; + this.dataList[this.lsIndex].uname = data[0].name; + this.modalshowflag = false; }, //确认转办 - checkedRole (data) { - this.assigneeNewLoading = true + checkedRole(data) { + this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false + this.isTransfer = false; if (res.success) { - this.drawerModal = false - this.$message.success('调整成功') + this.drawerModal = false; + this.$message.success("调整成功"); this.$router.push("/processCenter"); - this.processNum() + this.processNum(); } else { this.$message.warning(res.message) } diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue new file mode 100644 index 000000000..b3ec93312 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -0,0 +1,681 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue new file mode 100644 index 000000000..82d9cc9c1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -0,0 +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/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 97723e319..d47164285 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -94,12 +94,12 @@
生成汇总单 生成上报意见
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index e30146ceb..ad935450d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -86,12 +86,12 @@
生成汇总单 生成上报意见
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index c87546e05..f6c8d9ea3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -86,12 +86,12 @@
生成汇总单 生成上报意见
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index a851a20d5..ef32a0454 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -86,12 +86,12 @@
生成汇总单 生成上报意见
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/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/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue new file mode 100644 index 000000000..72f75e6e7 --- /dev/null +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 212a98648..92bdf4bd1 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -250,6 +250,7 @@ export default { name: 'consultationDetails', data() { return { + freshClueNum: '', itermsConditionsFlag: false, itermsConditionsTitle: '', options: [], @@ -385,7 +386,7 @@ export default { }, //编辑 selectStandardPro(type, row) { - this.type = type + this.type = type if (type === 'edit') { this.id = row.id this.opiniontitle = '编辑意见内容' @@ -394,16 +395,34 @@ export default { this.opinionContent.oldText = row.oldText this.opinionContent.newText = row.newText this.opinionContent.cause = row.cause + this.isDialog = true } else { - this.id = '' - this.opiniontitle = '新增意见' - this.opinionContent.partCode = '' - this.opinionContent.reason = '' - this.opinionContent.oldText = '' - this.opinionContent.newText = '' - this.opinionContent.cause = '' + localStorage.setItem('freshClueNum', new Date().getTime()) + this.freshClueNum = localStorage.getItem('freshClueNum') || ''; + let routeData = this.$router.resolve({ + name: "AddFileDetails", + query: { + attId: this.fileInfoList[0].attId, + userId: this.$store.getters.userInfo.userId || '', + userName: this.$store.getters.userInfo.userName || '', + deptName: this.$store.getters.userInfo.institutionName || '', + deptId: this.$store.getters.userInfo.institutionId || '', + standId: JSON.parse(this.$route.query.item.files)[0].standId, + fileType: JSON.parse(this.$route.query.item.files)[0].standFileClassify, + ideaId: this.$route.query.item.id, + cid: this.$route.query.item.cid, + } + }); + window.open(routeData.href, '_blank') + // return + // this.id = '' + // this.opiniontitle = '新增意见' + // this.opinionContent.partCode = '' + // this.opinionContent.reason = '' + // this.opinionContent.oldText = '' + // this.opinionContent.newText = '' + // this.opinionContent.cause = '' } - this.isDialog = true }, //删除 deleteStand(id) { @@ -449,8 +468,8 @@ export default { cause: this.opinionContent.cause, userId: this.$store.getters.userInfo.userId || '', userName: this.$store.getters.userInfo.userName || '', - deptName: this.$store.getters.userInfo.orgName || '', - deptId: this.$store.getters.userInfo.orgId || '' + deptName: this.$store.getters.userInfo.institutionName || '', + deptId: this.$store.getters.userInfo.institutionId || '', } if (this.type === 'edit') { form.id = this.id @@ -498,6 +517,11 @@ export default { } }, mounted() { + window.addEventListener("storage", ev => { + if(ev.key === 'freshClueNum'){ + this.getList() + } + }) if (JSON.parse(this.$route.query.item.wkfiles).length) { this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles) } else { @@ -522,7 +546,7 @@ export default { this.getList() this.getIdeaKey() this.getFileInfo() - } + }, } diff --git a/src/router/index.js b/src/router/index.js index 5c112b253..2be48c1b8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -547,6 +547,51 @@ const routes = [ title: '标准合规评估流程' } }, + { + path: '/bzpgStep4', + name: 'bzpgStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step4.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/bzpgStep5', + name: 'bzpgStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step5.vue'), + meta: { + requireAuth: true, + 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', @@ -3720,6 +3765,19 @@ const routes = [ // menuId: '' } }, + { + path: '/AddFileDetails', + name: 'AddFileDetails', + component: () => + import('@/pages/regulatoryRepository/standardForComments/pags/AddFileDetails'), + meta: { + requireAuth: true, + title: '新增', + parentPath: '/standardForComments', + isBoolean: true, + // menuId: '' + } + }, { path: '/details', name: 'Details',