Merge branch 'feature/销售线索4' into dev

src/views/apps/customerApp/syncHistory.vue

@@ -33,7 +33,7 @@
         </el-table-column>
         <el-table-column label="操作人" prop="optStaffName" width="150"></el-table-column>
         <el-table-column label="涉及更新项" prop="taskContent" min-width="180"></el-table-column>
-        <el-table-column label="状态" prop="statusFlag" width="120">
+        <el-table-column label="状态" prop="statusFlag" width="180">
           <template slot-scope="{ row }">
             <div class="status-class">
               <span :class="['state-point', logStatusClass[row.statusFlag]]">{{ row.statusFlag | taskStatus }}</span>
@@ -63,10 +63,11 @@
     </el-dialog>
     <el-dialog :visible.sync="tagDialog" :close-on-click-modal="false" title="标签同步明细" width="500px" custom-class="sync-fail">
       <el-table :data="tagSyncData" class="m-b-20 m-t-20" v-loading="tagLoading" max-height="304">
-        <el-table-column prop="tagName" label="标签组"></el-table-column>
+        <el-table-column prop="tagName" label="标签组" show-overflow-tooltip></el-table-column>
         <el-table-column
           prop="statusFlag"
           label="同步状态"
+          width="100"
           :filters="[
             { text: '删除', value: 0 },
             { text: '预处理', value: 1 },
@@ -79,7 +80,7 @@
             <el-tooltip v-if="row.statusFlag === 2" open-delay="200" :content="row.reason" placement="top">
               <span class="tooltip-icon" style="cursor:default">{{ row.statusFlag | tagStatus }}</span>
             </el-tooltip>
-            <span v-else class="tooltip-icon" style="cursor:default">{{ row.statusFlag | tagStatus }}</span>
+            <span v-else style="cursor:default">{{ row.statusFlag | tagStatus }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -226,16 +227,19 @@ export default {
           return '删除';
           break;
         case 1:
-          return '成功';
+          return '同步标签组到企业微信';
           break;
         case 2:
-          return '失败';
+          return '同步好友标签';
           break;
         case 3:
-          return '部分成功';
+          return '同步成功';
           break;
         case 4:
-          return '同步中';
+          return '同步失败';
+          break;
+        case 5:
+          return '部分同步成功';
           break;
         default:
           break;