提交没来得代码修改

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -394,12 +394,17 @@
             <el-button @click.native="planToWithdraw()">撤回</el-button>
         </template>
 
-        <template v-if="addForm.id && millerSReviewer.includes(user.id) && [3, 4].includes(showMmeiLaiDeData.taskStatus)">
+        <template v-if="addForm.id && millerSReviewer.includes(user.id) && [3, 4].includes(showMmeiLaiDeData.taskStatus) && !permissions.taskApprovalPlan">
             <template v-if="(showMmeiLaiDeData.taskStatus == 3 && user.id == showMmeiLaiDeData.checkFirstId) || (showMmeiLaiDeData.taskStatus == 4 && user.id == showMmeiLaiDeData.checkSecondId)">
                 <el-button type="danger" @click="planOperation(false)" :loading="addLoading">驳回</el-button>
                 <el-button type="success" @click="planOperation(true)" :loading="addLoading">通过</el-button>
             </template>
         </template>
+
+        <template v-if="permissions.taskApprovalPlan">
+            <el-button type="danger" @click="planOperation(false)" :loading="addLoading">驳回</el-button>
+            <el-button type="success" @click="planOperation(true)" :loading="addLoading">通过</el-button>
+        </template>
         
         <template>
             <el-button type="primary" @click="submitInsert()" :loading="addLoading" v-if="addForm.canEditTask || !addForm.id">

fhKeeper/formulahousekeeper/timesheet_mld/src/permissions.js

@@ -158,9 +158,10 @@ const StringUtil = {
         equipmentInformationManagement: false,
         equipmentCostManagement: false,
 
-        // 任务
+        // 工作计划
         tasksReviewTaskFile: false,
-        viewFilesReviewedByOthers: false
+        viewFilesReviewedByOthers: false,
+        taskApprovalPlan: false
         
     }
     // console.log(arr);
@@ -308,6 +309,7 @@ const StringUtil = {
         arr[i] == '查看他人审核文件' ? obj.viewFilesReviewedByOthers = true : ''
 
         arr[i] == '全部工作计划待审核统计' ? obj.reportAllWorkPlansAwaitingReviewAndStatistics = true : ''
+        arr[i] == '审批计划' ? obj.taskApprovalPlan = true : ''
     }
     return obj
   }

fhKeeper/formulahousekeeper/timesheet_mld/src/views/task/list.vue

@@ -163,6 +163,15 @@
                             </div>
                         </template>
                     </el-table-column>
+                    <el-table-column prop="executorName" label="创建人" sortable width="130">
+                        <template slot-scope="scope">
+                            <!-- <el-link type="primary" @click="showUser(scope.row.executorId)">{{scope.row.executorName}}</el-link> -->
+                            <span v-if="user.userNameNeedTranslate == '1'">
+                                <TranslationOpenDataText type='userName' :openid='scope.row.createrName'></TranslationOpenDataText>
+                            </span>
+                            <span v-if="user.userNameNeedTranslate != '1'">{{scope.row.createrName}}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="executorName" :label="$t('zhi-hang-ren')" sortable width="130">
                         <template slot-scope="scope">
                             <!-- <el-link type="primary" @click="showUser(scope.row.executorId)">{{scope.row.executorName}}</el-link> -->