Merge branch 'gaoying' of http://gitlab.91isoft.com:90/car-test/web into develop

src/views/setting/sample/index.vue

@@ -73,7 +73,6 @@
     <el-table
       v-loading="tableLoding"
       :data="tableData"
-      style="width: 100%"
       border
       @sort-change="sortClick"
     >
@@ -139,7 +138,7 @@
         show-overflow-tooltip
         min-width="200"
       />
-      <el-table-column label="相关任务" width="200">
+      <el-table-column label="相关任务" width="500px" :resizable="false">
         <template slot-scope="scope">
           <div v-if="scope.row.taskSampleRelation.length > 0">
             <el-link
@@ -149,7 +148,7 @@
               :underline="false"
               class="custom-link"
               @click="goTaskDetails(item.taskId)"
-              >{{ item.taskName ? item.taskName : '--' }}
+              >{{ item.taskNo ? item.taskNo : '--' }}
               <span v-show="index + 1 != scope.row.taskSampleRelation.length">
                 ,
               </span></el-link