diff --git a/src/components/feedBack/index.vue b/src/components/feedBack/index.vue index a624ad71..a89eb46c 100644 --- a/src/components/feedBack/index.vue +++ b/src/components/feedBack/index.vue @@ -1,109 +1,115 @@ + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 42a18202..c465103b 100644 --- a/src/main.js +++ b/src/main.js @@ -62,6 +62,8 @@ import MFA from '@/components/MFA/index' Vue.use(MFA) import FB from '@/components/feedBack/index' Vue.use(FB) +import FBT from '@/components/feedBackTable/index' +Vue.use(FBT) import adaptive from '@/directive/adaptive/index' // 表格自适应指令 Vue.use(adaptive) diff --git a/src/views/feedBack/index.vue b/src/views/feedBack/index.vue index 5f37c455..4b36c382 100644 --- a/src/views/feedBack/index.vue +++ b/src/views/feedBack/index.vue @@ -3,16 +3,39 @@
- - + + + + + + - - + + - - + + - - + + - + - + - - + + - + @@ -80,7 +120,12 @@ > {{ $t("common:button:reset") }} - + {{ $t("common:button:export") }} @@ -89,6 +134,7 @@ size="mini" @click="resolve" style="float: right" + v-if="level > 7" > {{ $t("feedBack:button:resolve") }} @@ -103,13 +149,20 @@ @sort-change="handleSortByColumn" :default-sort="{ prop: 'StudyTime', order: 'descending' }" > - + + @@ -207,11 +267,6 @@
diff --git a/src/views/trials/trials-layout/components/feedBack.vue b/src/views/trials/trials-layout/components/feedBack.vue index feb1ded7..ed965468 100644 --- a/src/views/trials/trials-layout/components/feedBack.vue +++ b/src/views/trials/trials-layout/components/feedBack.vue @@ -6,14 +6,17 @@ 'feedBack-out': show === false, }" @click.stop="open" + v-if="isShow" > -
+
{{ $t("triials:feedBack:botton:opinion") }} - {{ $t("triials:feedBack:botton:mine") }} + {{ + $t("triials:feedBack:botton:mine") + }}
@@ -37,6 +40,14 @@ export default { } }); }, + computed: { + isShow() { + if (this.hasPermi(["role:ir", "role:crc"])) { + return true; + } + return false; + }, + }, methods: { open() { if (this.show) { @@ -53,6 +64,10 @@ export default { }, }); }, + // 打开反馈列表 + openFeedBackTable() { + this.$FBT(); + }, }, }; diff --git a/src/views/trials/trials-layout/index.vue b/src/views/trials/trials-layout/index.vue index 5596bc22..4517da95 100644 --- a/src/views/trials/trials-layout/index.vue +++ b/src/views/trials/trials-layout/index.vue @@ -6,7 +6,7 @@ - +