bug修改

src/views/task/projectTable.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
     <el-form v-model="queryParams" size="mini" :inline="true">
-      <el-form-item>
-        <el-radio-group v-model="viewType" size="mini">
-          <el-radio-button label="表格视图"></el-radio-button>
-          <el-radio-button label="甘特图视图"></el-radio-button>
-        </el-radio-group>
-      </el-form-item>
       <el-form-item label="项目">
         <el-select v-model="queryParams.projectIds" multiple collapse-tags size="mini" @change="selectProjectChange">
           <el-option v-for="(item,index) in projectList" :label="item.projectName" :key="index"

src/views/task/task.vue

@@ -562,7 +562,7 @@ export default {
         });
       }
       if (this.splitOpen) {
-        this.splitForm.checkTaskConflict = true;
+        this.splitForm.checkTaskConflict = false;
         splitTask(this.splitForm).then(res => {
           this.resetForm("splitForm");
           this.getList()

src/views/task/view.vue

@@ -63,7 +63,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" v-for="item in tableHeaders" :key="item.day" :prop="item.day" width="37">
-        <template slot="header" slot-scope="scope">
+        <template slot="header">
           <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>
           <div v-else-if="item.week=='周日'" style="width: 24px;font-size: 12px;color: #1c84c6">{{ item.week }}</div>
@@ -79,35 +79,35 @@
             trigger="click">
             <el-table :data="feedbacks" border size="mini">
               <el-table-column width="75" label="反馈状态">
-                <template slot-scope="scope">
-                  <div>{{ getFeedbackTypeName(scope.row.feedbackType) }}</div>
+                <template slot-scope="item">
+                  <div>{{ getFeedbackTypeName(item.row.feedbackType) }}</div>
                 </template>
               </el-table-column>
               <el-table-column width="60" property="userName" label="反馈人"></el-table-column>
               <el-table-column width="55" label="完成度">
-                <template slot-scope="scope">
-                  <div>{{ scope.row.feedbackType === '4' ? '' : scope.row.value + '%' }}</div>
+                <template slot-scope="item">
+                  <div>{{ item.row.feedbackType === '4' ? '' : item.row.value + '%' }}</div>
                 </template>
               </el-table-column>
               <el-table-column width="110" property="createTime" label="反馈时间">
-                <template slot-scope="scope">
-                  <div>{{ parseTime(scope.row.createTime) }}</div>
+                <template slot-scope="item">
+                  <div>{{ parseTime(item.row.createTime) }}</div>
                 </template>
               </el-table-column>
               <el-table-column label="反馈备注">
-                <template slot-scope="scope">
+                <template slot-scope="item">
                   <div>
-                    <span v-html="scope.row.description"></span>
-                    <span v-for="(file,index) in scope.row.fileList">
+                    <span style="margin: 0" v-html="item.row.description"></span>
+                    <span v-for="(file,index) in item.row.fileList">
                                 <a :href="file.url" style="color: darkgreen">
                                   <span v-html="file.fileName"></span>
                                 </a>
-                              </span>
+                    </span>
                     <span
-                      v-if="scope.row.feedbackType === '4'&&scope.row.executor===userId&&scope.row.commentConfirm!='1'"
-                      style="position: absolute;right: 2px">
+                      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(scope.row)">确认</el-button>
+                               @click="confirmComment(item.row)">确认</el-button>
                     </span>
                   </div>
                 </template>