humingbo 1 год назад
Родитель
Сommit
628a93c353
2 измененных файлов с 16 добавлено и 8 удалено
  1. 2 5
      src/views/meeting/weekly.vue
  2. 14 3
      src/views/meeting/weeklyRecords.vue

+ 2 - 5
src/views/meeting/weekly.vue

@@ -2,12 +2,9 @@
   <div class="app-container">
   <div class="app-container">
     <el-form size="mini" :inline="true">
     <el-form size="mini" :inline="true">
       <el-form-item label="关联会议">
       <el-form-item label="关联会议">
-        <el-select size="small" placeholder="关联会议" clearable filterable v-model="meetingWeek"
-                   @change="changeWeekData()">
-          <el-option v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id"
-                     :value="item.weeks"></el-option>
+        <el-select size="small" placeholder="关联会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
+          <el-option v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id" :value="item.weeks"></el-option>
         </el-select>
         </el-select>
-
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-download" @click="generateWeekly()" v-show="false">周报生成</el-button>
         <el-button type="primary" icon="el-icon-download" @click="generateWeekly()" v-show="false">周报生成</el-button>

+ 14 - 3
src/views/meeting/weeklyRecords.vue

@@ -4,7 +4,7 @@
       <div style="font-size: 24px">{{ m.meetingName }}</div>
       <div style="font-size: 24px">{{ m.meetingName }}</div>
       <div>
       <div>
         <el-button size="mini" @click="meetingResultConfirm" type="primary"  style="margin-right: 20px">会议结果确认</el-button>
         <el-button size="mini" @click="meetingResultConfirm" type="primary"  style="margin-right: 20px">会议结果确认</el-button>
-        <el-button size="mini" @click="exportPdf"  style="margin-right: 20px">导出</el-button>
+        <el-button size="mini" @click="exportPdf"  style="margin-right: 20px" v-if="workScoreVisible">导出</el-button>
       </div>
       </div>
 
 
     </div>
     </div>
@@ -95,7 +95,7 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table-column>
       </el-table-column>
-      <el-table-column prop="scores" label="评分" width="150" align="center" v-has-permi="['weekly:weekly:list']">
+      <el-table-column prop="scores" label="评分" width="150" align="center" v-if="workScoreVisible">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score"
           <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score"
                            @change="workComment(scope.row)">
                            @change="workComment(scope.row)">
@@ -109,7 +109,7 @@
           </el-input>
           </el-input>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column prop="workComments" label="工作评论">
+      <el-table-column prop="workComments" label="工作评论" v-if="workScoreVisible">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <el-input v-model="scope.row.workComment" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)"></el-input>
           <el-input v-model="scope.row.workComment" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)"></el-input>
         </template>
         </template>
@@ -237,6 +237,7 @@ export default {
       workPlanVisible:false,
       workPlanVisible:false,
       projects:[],
       projects:[],
       row:null,
       row:null,
+      workScoreVisible:false,
     }
     }
   },
   },
   created() {
   created() {
@@ -249,6 +250,16 @@ export default {
   },
   },
   methods: {
   methods: {
     getData() {
     getData() {
+      //获取工作评分与工作评论权限
+      let permissions= this.$store.getters.permissions;
+      for(let i=0;i<permissions.length;i++){
+        if(permissions[i]==='weekly:weekly:score'){
+          this.workScoreVisible=true
+          break;
+        }
+      }
+      console.log(JSON.stringify(permissions))
+
       let meetingId = this.meetingId
       let meetingId = this.meetingId
       let weeks = this.weeks
       let weeks = this.weeks
       if (meetingId != null && weeks != null) {
       if (meetingId != null && weeks != null) {