Merge branch 'crm_16.1' into debug

src/views/dataReport_manage/raiStockCutomList.vue

@@ -85,13 +85,22 @@
                 <span v-if="scope.row.RenewalTodo">To Do 事项：{{ scope.row.RenewalTodo }}</span>
                 <span v-if="scope.row[item.key] || scope.row.RenewalTodo" style="color: #409eff; cursor: pointer" @click="renewalReasonMore(scope.row)">&emsp;更多>></span>
               </span>
-              <div v-else-if="item.key == 'CompanyName'" style="padding: 4px 0">
+              <!-- <div v-else-if="item.key == 'CompanyName'" style="padding: 4px 0">
                 <span :style="item.textsty" @click="jumpHandle(scope.row, item)">
                   {{ scope.row[item.key] }}
                 </span>
                 <div class="package-difference" v-if="scope.row.PackageDifference">
                   {{ scope.row.PackageDifference }}
                 </div>
+              </div> -->
+               <div v-else-if="item.key == 'CompanyName'" style="padding: 4px 0">
+                <el-tooltip effect="dark" placement="top-start" content="过去4周，kp均未覆盖服务" v-if="scope.row.IsUserMaker == -1">
+                  <span class="deletesty" @click="jumpHandle(scope.row, item)">{{ scope.row[item.key] }}</span>
+                </el-tooltip>
+                <span v-else class="editsty" @click="jumpHandle(scope.row, item)">{{ scope.row[item.key] }}</span>
+                <div class="package-difference" v-if="scope.row.PackageDifference" @click="previousDetailHadler(scope.row)">
+                  {{ scope.row.PackageDifference }}
+                </div>
               </div>
               <div v-else-if="item.key === 'Remark'" class="remark-row">
                 <span class="remark-text" @click="viewHistoryRemarkFun(scope.row)" v-if="scope.row.IsShowNoRenewedNote">...</span>