Merge branch 'develop' into developer/yanjiaxu

src/views/task/new/index.vue

@@ -201,7 +201,7 @@
           <el-table-column prop="orderIndex" label="排序">
             <template slot-scope="scope">
               <div v-if="scope.row.isLeader !== 2" class="sortable-handle">
-                {{ '拖动排序' }}
+                <icon-park type="sort-three" size="14" fill="#F9A221" />
               </div>
             </template>
           </el-table-column>
@@ -934,11 +934,20 @@ export default {
         closeOnClickModal: false,
         confirmButtonClass: 'queryBtn'
       }).then(() => {
+        // 把当前人取消禁用
+        this.userList.find(
+          item => item.userId.toString() === row.userId.toString()
+        ).disabled = false
         this.tableData = this.tableData.filter(
           item => item.userId !== row.userId
         )
-        // 把当前人取消禁用
-        this.userList.find(item => item.userId === row.userId).disabled = false
+        this.tableData = this.tableData.map((item, index) => {
+          if (index === 0) {
+            return { ...item, isLeader: 1 }
+          } else {
+            return { ...item, isLeader: 0 }
+          }
+        })
       })
     },
     /**