其他收入统计

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1206,7 +1206,7 @@ export default {
         {
           field: "QiTa",
           formatter: this.moneyFormat,
-          title: "其他",
+          title: "其他支出",
           width: 90,
           titleAlign: "left",
           columnAlign: "right",
@@ -1273,6 +1273,16 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "QTShouRu",
+          formatter: this.moneyFormat,
+          title: "其他收入",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "YingFu",
           formatter: this.moneyFormat,

src/components/SalesModule/enrollTotal.vue

@@ -226,6 +226,7 @@
         <td>
           <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
           <p>{{item.contactMobile}}</p>
+          <p v-if="item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
         </td>
         <td>
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>

src/components/SalesModule/groupTourOrder.vue

@@ -1549,6 +1549,7 @@
             <td>
               <p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
               <p class="fz12">{{item.contactMobile}}</p>
+              <p class="fz12" v-if="item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
             </td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1799,6 +1799,7 @@
                   class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
                 <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder' class="fz12">
                   {{item.contactMobile}}</p>
+                <p class="fz12" v-if="(item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder)&&item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
                 <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168&&isUpdateOrder==false'>*****</p>
                 <!-- <p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
               <p class="fz12">{{item.contactMobile}}</p> -->

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1855,6 +1855,7 @@
                   {{childItem.ContactName}}</p>
                 <p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12">{{childItem.ContactMobile}}</p>
                 <p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p>
+                <p v-if="childItem.IndustryCategory!==''" style="color:green">行业类别：{{childItem.IndustryCategory}}</p>
               </td>
               <td>
                 <!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
@@ -2224,6 +2225,7 @@
                 :title="item.ContactName">{{item.ContactName}}</p>
               <p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12">{{item.ContactMobile}}</p>
               <p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p>
+              <p v-if="item.IndustryCategory!==''" style="color:green">行业类别：{{item.IndustryCategory}}</p>
             </td>
             <td>
               <!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -194,15 +194,15 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_shou">
                     <i class="iconfont icon-qian"></i>
-                  </span>其他收入
+                  </span>其他总收入
                 </div>
                 <div class="Team_Incontent">
                   <div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
                   <div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
                    <div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div> 
-                  <!--<div>
-                    注：应收=订单应收总额，实收=订单实收总额
-                  </div>-->
+                  <div>
+                    注：此处不进入'利润'计算，单纯只统计除团费外的其他总收入
+                  </div>
                 </div>
               </div>
             </el-col>
@@ -234,7 +234,7 @@
                   <div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
                   <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
                   <div>
-                    注：实收-(应付/实付)+佣金收入+自费收入-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
+                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入(此处为收入模块下其他收入)-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
                   </div>
                 </div>
               </div>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -342,6 +342,7 @@
           <td>
             <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
             <p>{{item.contactMobile}}</p>
+            <p v-if="item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
           </td>
           <td v-if="userId==1">
             <button class="normalBtn" @click="getSalerInfo(item)">修改业务员</button>