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="180">
+        <el-table-column label="状态" prop="statusFlag" width="200">
           <template slot-scope="{ row }">
             <div class="status-class">
               <span :class="['state-point', logStatusClass[row.statusFlag]]">{{ row.statusFlag | taskStatus }}</span>
@@ -42,8 +42,11 @@
         </el-table-column>
         <el-table-column label="操作" width="280">
           <template slot-scope="{ row }">
-            <el-button type="text" @click="tagLogShow(row)">标签同步明细</el-button>
-            <el-button type="text" @click="memberLogShow(row)">会员同步失败明细</el-button>
+            <template v-if="row.taskType === 0">
+              <el-button type="text" @click="tagLogShow(row)">标签同步明细</el-button>
+              <el-button type="text" @click="memberLogShow(row)">会员同步失败明细</el-button>
+            </template>
+            <p v-else></p>
           </template>
         </el-table-column>
       </el-table>
@@ -122,7 +125,7 @@ export default {
       memberLoading: false,
       tagLoading: false,
       tagDialog: false,
-      logStatusClass: { 0: 'state-point-default', 1: 'state-point-success', 2: 'state-point-error', 3: 'state-point-warning', 4: 'state-point-loading-scale' }
+      logStatusClass: { 0: 'state-point-default', 1: 'state-point-loading', 2: 'state-point-loading', 3: 'state-point-success', 4: 'state-point-error', 5: 'state-point-warning' }
     };
   },
   methods: {