Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue

@@ -186,13 +186,13 @@
                 <td>{{item.PostName?item.PostName:'-'}}</td>
                 <td>{{item.EmName}}</td>
                 <td>
-                    <span @click="item.ProfitMoney>0?clickUrl(item,1):''" :class="item.ProfitMoney>0?'clickCp':''">{{item.ProfitMoney}}</span>
+                    <span @click="item.ProfitMoney>0?clickUrl(item,1):''" :class="item.ProfitMoney>0&&item.EmName!='微途'?'clickCp':''">{{item.ProfitMoney}}</span>
                 </td>
                 <td>
-                    <span @click="item.LureNum>0?clickUrl(item,2):''" :class="item.LureNum>0?'clickCp':''">{{item.EmpType==2?item.LureNum:'-'}}</span>
+                    <span @click="item.LureNum>0?clickUrl(item,2):''" :class="item.LureNum>0&&item.EmName!='微途'?'clickCp':''">{{item.EmpType==2?item.LureNum:'-'}}</span>
                 </td>
                 <td>
-                    <span @click="item.OrderNum>0?clickUrl(item,3):''" :class="item.OrderNum>0?'clickCp':''">{{item.EmpType==2?item.OrderNum:'-'}}</span></td>
+                    <span @click="item.OrderNum>0?clickUrl(item,3):''" :class="item.OrderNum>0&&item.EmName!='微途'?'clickCp':''">{{item.EmpType==2?item.OrderNum:'-'}}</span></td>
                 <td>{{item.EmpType>0 ? '+ ' + item.WageMoney : '-'}}</td>
                 <td @click="GenerateScale(item)">
                     <span

src/components/FinancialModule/ImpressionTicketing/inAccordanceWithDialog.vue

@@ -256,7 +256,7 @@
                     'rgba(153, 199, 235,.2)',
                     'rgba(34,184,221,.2)',
                     'rgba(221,72,34,.2)',
-                    'rgba(204,51,204,.23)',
+                    'rgba(204,51,204,.2)',
                     'rgba(255,204,0,.2)',
                     'rgba(77,179,179,.2)',
                     'rgba(196,60,141,.2)',