Browse Source

任务管理修改

ysc 1 year ago
parent
commit
ed7d64a7e6
3 changed files with 12 additions and 12 deletions
  1. 1 1
      src/views/task/projectView.vue
  2. 3 4
      src/views/task/task.vue
  3. 8 7
      src/views/task/view.vue

+ 1 - 1
src/views/task/projectView.vue

@@ -65,7 +65,7 @@
           <span v-if="scope.row.formLastMonth" style="color: red">是</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" v-for="item in tableHeaders" :key="item.day" :prop="item.day" width="37">
+      <el-table-column align="center" v-for="item in tableHeaders" :key="item.day" :prop="item.day" width="38">
         <template slot="header" slot-scope="scope">
           <div style="width:28px;font-size: 10px">{{ item.day }}</div>
           <div v-if="item.week=='周六'" style="width: 24px;font-size: 12px;color: #1c84c6">{{ item.week }}</div>

+ 3 - 4
src/views/task/task.vue

@@ -62,9 +62,8 @@
                   height="calc(100vh - 180px)"
                   @row-click="rowClick"
                   row-key="id"
-                  lazy
-                  :load="load"
-                  :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+                  :indent="10"
+                  :tree-props="{children: 'children'}">
           <el-table-column label="任务编号" prop="id"/>
           <el-table-column label="任务名称" prop="taskName" min-width="150" :show-overflow-tooltip="true"/>
           <el-table-column label="执行(负责)人" prop="executorName"/>
@@ -485,7 +484,7 @@ export default {
 
     /** 查看任务详情*/
     rowClick(row, column, event) {
-      if (!column.property) {
+      if (!column.property || column.property === 'id') {
         return
       }
       getTask(row.id).then(res => {

+ 8 - 7
src/views/task/view.vue

@@ -103,16 +103,11 @@
                                   <span v-html="file.fileName"></span>
                                 </a>
                     </span>
-                    <span
-                      v-if="item.row.feedbackType === '4'&& scope.row.executor===userId && item.row.commentConfirm!='1'"
-                      style="position: absolute;right: 2px;top:5px">
-                    <el-button type="text" icon="el-icon-thumb" size="mini"
-                               @click="confirmComment(item.row)">确认</el-button>
-                    </span>
+
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="反馈详情" width="80px">
+              <el-table-column label="反馈详情" width="90px">
                 <template slot-scope="item">
                   <el-popover
                     placement="top"
@@ -121,6 +116,12 @@
                     <div v-html="item.row.descriptionDetail"></div>
                     <el-button slot="reference" type="text">详情</el-button>
                   </el-popover>
+                  <span
+                    v-if="item.row.feedbackType === '4'&& scope.row.executor===userId && item.row.commentConfirm!='1'"
+                    style="margin-left: 10px">
+                  <el-button type="text" icon="el-icon-thumb" size="mini"
+                             @click="confirmComment(item.row)">确认</el-button>
+                  </span>
                 </template>
               </el-table-column>
             </el-table>