Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/workbench/person/components/calenderList.vue

@@ -41,10 +41,15 @@
       :header-row-style="{height: '61px'}"
     >
       <el-table-column label="日程名称" prop="name" width="250" align="center" show-overflow-tooltip />
-      <el-table-column label="日期" width="250" align="center" show-overflow-tooltip>
+      <el-table-column label="日期" min-width="250" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          {{ scope.row.startTime }}~
-          {{ scope.row.endTime }}
+          <div v-if="busy === 0">
+            {{ scope.row.startTime }}~
+            {{ scope.row.endTime }}
+          </div>
+          <div v-if="busy === 1">
+            {{ scope.row.seperateDaysNoHoliday }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="使用/工作日/全部" align="center" width="150" show-overflow-tooltip>
@@ -59,7 +64,7 @@
           {{ scope.row.syncTeam === 1?'是':'否' }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" min-width="150" show-overflow-tooltip>
+      <el-table-column align="center" label="操作" width="150" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-button
             size="mini"