diff --git a/jwtech-admin-page/src/views/building/projectInfo/index.vue b/jwtech-admin-page/src/views/building/projectInfo/index.vue index c8c1eb87..7d02f8d9 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/index.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/index.vue @@ -838,6 +838,42 @@ /> --> + + + + + + + + + + + + + + @@ -1006,6 +1042,14 @@ {{ this.proMsg.fundingNumber }} + + + {{ this.proMsg.isKeyProject }} + + + + {{ this.proMsg.isPierceProject }} + @@ -1117,6 +1161,8 @@ export default { updateUid: null, updateTime: null, owerDept: null, + isKeyProject: null, + isPierceProject: null, }, // 排序方式 params: { @@ -1437,6 +1483,10 @@ export default { //是否又建议书审批字典 isApprovalOptions: [], isEdit: false, + SFoptions: [ + { label: "是", value: "是" }, + { label: "否", value: "否" }, + ], }; }, created() { @@ -1697,6 +1747,8 @@ export default { this.allDrawMsg = []; this.form = { id: null, + isKeyProject: null, + isPierceProject: null, isMajor: null, projectName: null, unitLeader: null, @@ -1756,6 +1808,8 @@ export default { pageSize: 10, data: { id: null, + isKeyProject: null, + isPierceProject: null, isMajor: null, projectName: null, unitLeader: null, diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue index c317102a..791243b0 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue @@ -181,6 +181,14 @@ {{ this.proMsg.fundingNumber }} + + + {{ this.proMsg.isKeyProject }} + + + + {{ this.proMsg.isPierceProject }} + --> + + + + + + + + + + + + + + - + @@ -137,7 +137,7 @@ - + diff --git a/jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue b/jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue index d87a41f4..98e34f1d 100644 --- a/jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue +++ b/jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue @@ -105,8 +105,9 @@ export default { returnToken(this.parmas).then((res) => { console.log("有效token", res); let token = res.token; - setToken(token); - this.getTreeData(); + setToken(token).thren(() => { + this.getTreeData(); + }); }); }, methods: {