111

src/components/SalesModule/enrollTotal.vue

@@ -169,6 +169,9 @@
             <p>
               <span>{{$t('salesModule.TCmoney')}}：{{countData.SumCommissionMoney}};</span>
             </p>
+            <p>
+              <span>额外提成：{{countData.ExtraCommissionMoney}};</span>
+            </p>
           </div>
         </el-col>
       </el-row>
@@ -264,8 +267,8 @@
 
 
         <td>
-          <span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
-          <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
+          <span v-if='item.dueInMoney==0' style="cursor: pointer;">{{item.income}}</span>
+          <span v-if='item.dueInMoney!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
         </td>
         <!-- 优惠 -->
         <td>

src/components/SalesModule/groupTourOrder.vue

@@ -1508,6 +1508,9 @@
             <p>
               <span>{{$t('salesModule.TCmoney')}}：{{countData.SumCommissionMoney}};</span>
             </p>
+            <p>
+              <span>额外提成：{{countData.ExtraCommissionMoney}};</span>
+            </p>
           </div>
         </el-col>
       </el-row>
@@ -1657,9 +1660,9 @@
                     </tr>
                   </table>
                 </div>
-                <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
+                <span v-if='item.dueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(item)"
                   slot="reference">{{item.income}}</span>
-                <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
+                <span v-if='item.dueInMoney!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
                   slot="reference">{{item.income}}</span>
               </el-popover>
             </td>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1907,7 +1907,7 @@
                     </table>
                   </div>
                   <span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'
-                    :style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
+                    :style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
                     slot="reference">{{item.income}}</span>
                   <span v-else>******</span>
                 </el-popover>
@@ -2432,7 +2432,7 @@
                   </table>
                 </div>
                 <span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'
-                  :style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
+                  :style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
                   slot="reference">{{item.income}}</span>
                 <span v-else>******</span>
               </el-popover>

src/components/SalesModule/planeTourOrder.vue

@@ -1255,8 +1255,8 @@
 								</tr>
 							</table>
 						</div>	
-						<span v-if='item.preferPrice==item.income' style="cursor: pointer;color: #FF9C00;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
-						<span v-if='item.preferPrice!=item.income' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+						<span v-if='item.dueInMoney==0' style="cursor: pointer;color: #FF9C00;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+						<span v-if='item.dueInMoney!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
 						</el-popover>
 					</td>
           <td>{{item.refund}}</td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1759,9 +1759,9 @@
                     </tr>
                   </table>
                 </div>
-                <span v-if='item.IsEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
+                <span v-if='item.DueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(item)"
                   slot="reference">{{item.Income}}</span>
-                <span v-if='item.IsEnd!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
+                <span v-if='item.DueInMoney!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
                   slot="reference">{{item.Income}}</span>
               </el-popover>
             </td>
@@ -2099,9 +2099,9 @@
                       </tr>
                     </table>
                   </div>
-                  <span v-if='childItem.IsEnd==0' style="cursor: pointer;" @click="getOrderDetail(childItem)"
+                  <span v-if='childItem.DueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(childItem)"
                     slot="reference">{{childItem.Income}}</span>
-                  <span v-if='childItem.IsEnd!=0' class="colorE95252" style="cursor: pointer;"
+                  <span v-if='childItem.DueInMoney!=0' class="colorE95252" style="cursor: pointer;"
                     @click="getOrderDetail(childItem)" slot="reference">{{childItem.Income}}</span>
                 </el-popover>
               </td>
@@ -2511,9 +2511,9 @@
                     </tr>
                   </table>
                 </div>
-                <span v-if='item.IsEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
+                <span v-if='item.DueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(item)"
                   slot="reference">{{item.Income}}</span>
-                <span v-if='item.IsEnd!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
+                <span v-if='item.DueInMoney!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
                   slot="reference">{{item.Income}}</span>
               </el-popover>
             </td>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -263,8 +263,8 @@
           </td>
 
           <td>
-            <span v-if="item.isEnd==0">{{item.income}}</span>
-            <span v-if="item.isEnd!=0" style="color: #e95252;">{{item.income}}</span>
+            <span v-if="item.dueInMoney==0">{{item.income}}</span>
+            <span v-if="item.dueInMoney!=0" style="color: #e95252;">{{item.income}}</span>
           </td>
           <!-- 优惠 -->
           <td>