From 4f37dc341f3f31cf87871d9749ba3fbf21bb44e8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 27 Jul 2021 14:39:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20=E5=B7=A6=E4=BE=A7=E6=A0=91=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 8 +++++--- .../domesticStandardsAndRegulations/index.vue | 14 +++++++++----- .../foreignStandardsAndRegulations/index.vue | 11 ++++++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0e9a838b7..4a5b94f9d 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1267,6 +1267,9 @@ export default { }, watch: {}, methods: { + FormatDate(date){ + return moment(date).format('YYYY-MM-DD'); + }, // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { @@ -2703,8 +2706,8 @@ export default { location.half = half location.showAll = false }) - this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', { - standId: this.$route.params.id + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { + id: this.$route.params.id }, { _this: this }, res => { @@ -2721,7 +2724,6 @@ export default { } }) this.dynamicFormField = displayLocation - console.log(this.dynamicFormField) }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 80c28f02a..cd2dcfac0 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2679,10 +2679,11 @@ export default { }, // 树节点鼠标移入移出 mouseenter(data){ - console.log(data) - this.$set(data, 'show', true) - if(data.parentId !== null){ - this.$set(data, 'showDel', true) + if(data.menuName !== '我的收藏'){ + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } } }, mouseleave(data){ @@ -2690,6 +2691,7 @@ export default { this.$set(data, 'showDel', false) }, treeClick (treeNode) { + console.log(treeNode) this.selectSarMenu = treeNode this.standCommonlySearch.menuId = treeNode.id this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 @@ -3431,8 +3433,9 @@ export default { formData.nowOrder = this.nowOrder formData.nowOrderBy = this.nowOrderBy // formData.orderBy = this.orderBy + console.log(this.selectSarMenu.id) // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.menuName === '我的收藏') { formData.menuId = undefined formData.labelMenuId = undefined formData.collectMenuId = 'wdsc' @@ -3472,6 +3475,7 @@ export default { } } this.stahndinfoList = res.data.list + console.log(this.stahndinfoList) this.total = res.data.count if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 131840831..ff9af285b 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2217,10 +2217,11 @@ export default { }, // 树节点鼠标移入移出 mouseenter(data){ - console.log(data) - this.$set(data, 'show', true) - if(data.parentId !== null){ - this.$set(data, 'showDel', true) + if(data.menuName !== '我的收藏'){ + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } } }, mouseleave(data){ @@ -2878,7 +2879,7 @@ export default { formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.menuName === '我的收藏') { formData.menuId = undefined formData.labelMenuId = undefined formData.collectMenuId = 'wdsc' From 7657b7ed6af90e6c6a89bc7493e1938e83dffa7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 27 Jul 2021 14:53:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 2855 ++++++++--------- .../pages/creatProcess/bzqdfb/step1.vue | 70 +- .../pages/creatProcess/bzqdfb/step2.vue | 20 +- .../pages/creatProcess/xmpg2/step5.vue | 2 +- .../tabComponents/processCenter/index.vue | 66 + 5 files changed, 1530 insertions(+), 1483 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index bc2aba78e..6d6626e98 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1,1456 +1,1431 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index c274edff0..302272626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,26 +49,25 @@ > -
-

{{listForm.fileName}} +

+

+ {{ listForm.fileName }} + + + 点击上传 + +

-
- - - 点击上传 - - -
@@ -741,17 +740,13 @@ export default { }, roleForm: { startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + startUser: this.$store.getters.userInfo.userId, dockUser: "", - responUserList: "", ministerUser: "", directorUser: "", - presidentUser: "", dockUserName: "", - responUserListName: "", ministerUserName: "", directorUserName: "", - presidentUserName: "" }, formRules: { listType: [ @@ -806,7 +801,7 @@ export default { modelName: "", standId: "", //选择的清单的id signFlag: "1", //是否会签 1为会签 2为不会签 - inforlist: "", //用来存放标准列表的标准id + inforlist: " ", //用来存放标准列表的标准id dataList: [{ code: "", //标准号 standName: "", //标准名称 @@ -850,9 +845,6 @@ export default { } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = data[0].id; - this.roleForm.presidentUserName = data[0].name; } this.modalshowflag = false; }, @@ -1032,19 +1024,8 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - let json = this.listForm; - this.listForm.fileId = this.fileIds.join(","); - this.listForm.fileName = this.fileListName.join(","); - this.listForm.model = this.listForm.fileId; - this.listForm.modelName = this.listForm.fileName; - json.zrUserId = this.roleForm.dockUser; //会签人 - json.jlUserId = this.roleForm.directorUser; //业务经理 - json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standName = this.listForm.listName; - json.standId = this.listForm.standId; + var json = Object.assign(this.listForm, this.roleForm) + console.log(json); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1100,6 +1081,12 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); + if(this.listForm.fileName === null ){ + this.listForm.fileName = this.fileListName.join(',') + }else { + this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); + } + this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') this.$message.success("上传成功"); } else { this.$message.error(res.message); @@ -1202,6 +1189,7 @@ export default { if (this.standList.length < 1) { this.$message.warning("请选择需要添加进清单的数据"); } else { + let exits = [] this.standList.map(item => { let newStand = false; for (let itemKey of this.dataList) { @@ -1214,8 +1202,10 @@ export default { this.$message.warning("请勿重复添加数据"); } else { this.dataList.push(item); + exits.push(item.id) } }); + this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') this.standardData = []; this.standModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 976a14cda..617b6018c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -78,8 +78,13 @@ width="180px" label="标准号"> diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 64152b927..c6302ea23 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -600,6 +600,72 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '分发负责人审批') { + this.$router.push({ + name: 'xmpg2Step7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理审批') { + this.$router.push({ + name: 'xmpg2Step8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '工程经理审批') { + this.$router.push({ + name: 'xmpg2Step9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部经理审批') { + this.$router.push({ + name: 'xmpg2Step10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '汇总审批') { + this.$router.push({ + name: 'xmpg2Step11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审批') { + this.$router.push({ + name: 'xmpg2Step12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程