暂存到本地

src/assets/common/lang/zh.js

@@ -35,7 +35,8 @@ export const pub={
   closeWindow:'关闭窗口',
   noMsg:'咱无',
   returnBack:'返回',
-  allday:'全天'
+  allday:'全天',
+  clickToView:'点击查看',
 }
 
 export const login = {
@@ -709,4 +710,24 @@ export const rule = {
   startDate: '请选择开始日期',
   endDate: '请选择结束日期',
   
-}
+}
\ No newline at end of file
+export const Operation = {
+  Op_ShortName:'线路简称',
+  Op_sname:'简称',
+  Op_depositAmount:'最低定金金额',
+  Op_EarlybirdDay:'早鸟优惠天数',
+  Op_LossAllocation:'损失分摊比列',
+  Op_partInCompany:'参与公司',
+  Op_belongDepartment:'所属部门',
+  Op_CombinedContry:'关联国家',
+  Op_lowDeposit:'最低定金',
+  Op_preferentialDays:'优惠天数',
+  Op_isDirect:'是否直采',
+  Op_isShared:'是否共享',
+  Op_AllowSmallGroup:'允许小包团',
+  Op_Project:'项目',
+  Op_notInvoled:'未参与',
+  Op_ManageDepartment:'管理部门',
+}
+
+

src/components/ShoppingStore/ShoppingDetails.vue

@@ -13,6 +13,7 @@
   height: 30px;
   text-align: center;
   line-height: 30px;
+  margin-right:30px;
 }
 .ShoppingDetails .backBtn {
   float: right;
@@ -51,14 +52,13 @@
   height: 38px;
   background-color: #ededed;
   line-height: 38px;
-  min-width: 1400px;
 }
 .infoTitle span {
   display: inline-block;
   color: #000000;
   font-family: PingFangSC-Semibold, sans-serif;
   font-size: 12px;
-  width: 10%;
+  width: 12%;
   text-align: center;
 }
 .listInfo {
@@ -66,7 +66,6 @@
   height: 50px;
   background-color: #fff;
   margin-bottom: 10px;
-  min-width: 1400px;
   line-height: 50px;
   font-size: 12px;
 }
@@ -76,7 +75,7 @@
 }
 .listInfo span {
   display: inline-block;
-  width: 10%;
+  width: 12%;
   text-align: center;
 }
 .travelProfit {
@@ -153,21 +152,31 @@
   background-color: #fff;
   padding-top: 50px;
 }
+.Shop_span{
+  font-size:14px;
+}
 </style>
 <template>
     <div class='flexOne ShoppingDetails'>
             <div class="dataIn clearfix">
                 <div class="storeName">{{Name}}</div>
-                <input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
-                <input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板"/>
+                <span class="Shop_span">日期</span>
+                <el-date-picker class="w150" type="date" v-model="msg.StartDate" :picker-options="pickerBeginDateBefore"
+                  value-format="yyyy-MM-dd" placeholder></el-date-picker>
+                <el-date-picker class="w150" type="date" v-model="msg.EndDate" :picker-options="pickerBeginDateAfter"
+                  value-format="yyyy-MM-dd" placeholder></el-date-picker>
+
+                <input type="button" class="normalBtn backBtn" @click="showStatis(1)" v-if="isShow==false" value="数据看板" style="display:none;"/>
                 <input type="button" class="normalBtn backBtn" @click="showStatis(2)" v-else value="列表"/>
+                <input type="button" class="hollowFixedBtn backBtn" @click="goUrl('ShoppingStore')" value="返回"/>
+                <input type="button" class="hollowFixedBtn backBtn" @click="getList()" value="查询"/>
             </div>
-            <div class="listSpan">
+            <!-- <div class="listSpan">
                 <span>总交易额：<label class="ShopDetail_c1 fbold">{{TotalPrice}}</label></span>
                 <span>旅行社盈利：<label class="ShopDetail_c2 fbold">{{GroupExtract}}</label></span>
                 <span>导游盈利：<label class="ShopDetail_c3 fbold">{{GuideExtract}}</label></span>
                 <span>领队盈利：<label class="ShopDetail_c4 fbold">{{LeaderExtract}}</label></span>
-            </div>
+            </div> -->
             <div class="mainInfo" :class="{'hidDiv':isShow}">
                 <div class="infoTitle">
                     <span>进店日期</span>
@@ -176,32 +185,30 @@
                     <span>旅行社提成</span>
                     <span>导游提成</span>
                     <span>领队提成</span>
-                    <span>操作人</span>
-                    <span>币种</span>
-                    <span>日期</span>
+                    <span>返佣余额</span>
+                    <span>返佣总计</span>
                 </div>
                 <div class="listInfo" v-for="item in DataList" :key="item.subCode">
                     <span>{{item.StoreTime}}</span>
                     <span>{{item.TCID}}</span>
                     <span class="totalPrice">
-                        <label class="total ShopDetail_c1">￥{{item.NowTotalPrice}}</label>
-                        <label class="littleTotal">（{{item.TotalPrice}}*{{item.Rate}}）</label>
+                        <label class="total ShopDetail_c1">￥{{getPrice(item.TotalMoney,item.DMCRate)}}</label>
+                        <label class="littleTotal">（{{item.TotalMoney}}*{{item.DMCRate}}）</label>
                     </span>
                     <span class="totalPrice">
-                        <label class="total ShopDetail_c2">￥{{item.NowGroupExtract}}</label>
-                        <label class="littleTotal">（{{item.GroupExtract}}*{{item.Rate}}）</label>
+                        <label class="total ShopDetail_c2">￥{{getPrice(item.CompanyCommission,item.DMCRate)}}</label>
+                        <label class="littleTotal">（{{item.CompanyCommission}}*{{item.DMCRate}}）</label>
                     </span>
                     <span class="totalPrice">
-                        <label class="total ShopDetail_c3">￥{{item.NowGuideExtract}}</label>
-                        <label class="littleTotal">（{{item.GuideExtract}}*{{item.Rate}}）</label>
+                        <label class="total ShopDetail_c3">￥{{getPrice(item.GuideCommission,item.DMCRate)}}</label>
+                        <label class="littleTotal">（{{item.GuideCommission}}*{{item.DMCRate}}）</label>
                     </span>
                     <span class="totalPrice">
-                        <label class="total ShopDetail_c4">￥{{item.NowLeaderExtract}}</label>
-                        <label class="littleTotal">（{{item.LeaderExtract}}*{{item.Rate}}）</label>
+                        <label class="total ShopDetail_c4">￥{{getPrice(item.LeaderCommission,item.DMCRate)}}</label>
+                        <label class="littleTotal">（{{item.LeaderCommission}}*{{item.DMCRate}}）</label>
                     </span>
-                    <span>{{item.emName}}</span>
-                    <span>{{item.currencyName}}</span>
-                    <span>{{item.UpdateDate}}</span>
+                    <span>{{item.OtherDeduct}}</span>
+                    <span>{{item.BackTotalMoney}}</span>
                 </div>
                 <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
                 </el-pagination>
@@ -241,7 +248,9 @@ export default {
       msg: {
         pageIndex: 1,
         pageSize: 10,
-        ShoppingID: ""
+        ShopId: "",
+        StartDate:'',
+        EndDate:''
       },
       noData: false,
       loading: true,
@@ -269,27 +278,40 @@ export default {
       DayGroupExtract: [],
       DayGuideExtract: [],
       DayLeaderExtract: [],
-      DaydataZoom: []
+      DaydataZoom: [],
+      pickerBeginDateBefore: {
+        disabledDate: time => {
+          let endTime = new Date(this.msg.EndDate)
+          return endTime.getTime() < time.getTime()
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: time => {
+          let startTime = new Date(this.msg.StartDate)
+          return startTime.getTime() >= time.getTime()
+        }
+      }
     };
   },
   methods: {
     getList() {
       this.loading = true;
       this.apipost(
-        "ShoppingInfo_Post_GetPageList",
+        "ShoppingInfo_Post_GetPriceShopDetailsPageList",
         this.msg,
         res => {
+          this.loading = false;
           if (res.data.resultCode == 1) {
             this.loading = false;
             if (res.data.data.count > 0) {
-              this.total = res.data.data.count;
               this.noData = false;
-              this.DataList = res.data.data.pageData;
             } else {
               this.noData = true;
             }
-          } else {
-            this.loading = false;
+            this.total = res.data.data.count;
+            this.DataList = res.data.data.pageData;
+          }else{
+            this.Error(res.data.message);
           }
         },
         err => {}
@@ -490,10 +512,14 @@ export default {
       };
       myChart.clear();
       myChart.setOption(option2);
-    }
+    },
+    //乘以获得2位小数
+    getPrice(x,y){
+      return (x*y).toFixed(2);
+    } 
   },
   mounted() {
-    this.msg.ShoppingID = this.$route.query.id;
+    this.msg.ShopId = this.$route.query.id;
     this.Name = this.$route.query.Name;
     this.TotalPrice = this.$route.query.TotalPrice;
     this.GroupExtract = this.$route.query.GroupExtract;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -631,6 +631,8 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
                       </el-dropdown-item>
+                      <el-dropdown-item @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)" style="display:none;">收入确认单
+                      </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID)">
                         B2B预览
                       </el-dropdown-item>
@@ -1221,6 +1223,16 @@
         })
         window.open(routeData.href, '_blank')
       },
+      goSureOrder(path,TCID){
+        this.$router.push({
+          name: path,
+          query: {
+            TCID: TCID,
+            blank: 'y',
+            tab: '收入确认单'
+          }
+        })
+      },
       goUrlMake(path, LineID, TCID, name) {
         this.$router.push({
           name: path,

src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue

+<style>
+    .priceIncomeTable{
+        width:1200px;
+        border-collapse:collapse;
+        font-size:14px;
+    }
+    .priceIncomeTable td{
+        border: 1px solid #dcdfe6;
+        height:34px;
+        background-color: #fff;
+        text-align: center;
+    }
+    .priceComtd{
+        background: #e6e6e6!important;
+    }
+    .princeOrderSpan{
+        margin-right:10px;
+        display: inline-block;
+    }
+    .PriceRemark{
+        width:100%;
+        min-height: 100px;
+        padding:10px;
+        font-size: 14px;
+        background-color: #fff;
+    }
+    .leftRemarkTitle{
+        float:left;
+        width:5%;
+        text-align: right;
+    }
+    .rightRemarkContent{
+        float:left;
+        width:95%;
+    }
+</style>
+
+<template>
+    <div>
+        <table class="singeRowTable">
+            <tr>
+                <th colspan="10">团队收入确认单</th>
+            </tr>
+            <tr>
+                <th>部门</th>
+                <th width="250">单号</th>
+                <th width="180">团号</th>
+                <th>团队编号</th>
+                <th>人数</th>
+                <th width="100">领队</th>
+                <th>团费收入合计</th>
+                <th>直客收入</th>
+                <th>同行交客收入</th>
+                <th>平台收入</th>
+            </tr>   
+            <tr>
+                <td>{{dataList.DepartmentName}}</td>
+                <td>
+                    <span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
+                </td>
+                <td>{{dataList.TCNUM}}</td>
+                <td>{{dataList.TCID}}</td>
+                <td>{{dataList.PeopleNum}}</td>
+                <td>{{dataList.LeaderName}}</td>
+                <td>{{dataList.TotalIncome}}</td>
+                <td>{{dataList.DirectGuestIncome}}</td>
+                <td>{{dataList.PlatformGuestIncome}}</td>
+                <td>{{dataList.PlatformIncome}}</td>
+            </tr>
+        </table>
+        <div class="PriceRemark clearfix">
+             <div class="leftRemarkTitle">备注：</div>   
+             <div class="rightRemarkContent">{{dataList.Remark}} </div>
+        </div>
+    </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        loading:false,
+        msg: {
+            tcid:''
+        },
+        dataList:[],
+      };
+    },
+    methods: {
+      getList() {
+        //获取数据
+        this.loading=true;
+        this.apipost(
+          "travel_post_GetPriceIncomeConfirmInfo",
+          this.msg,
+          res => {
+            this.loading=false;
+            if (res.data.resultCode == 1) {
+                console.log(res,'data');
+                this.dataList = res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          err => {}
+        );
+      },
+    },
+    mounted() {
+      this.msg.tcid = this.$route.query.TCID;
+      this.getList();
+    }
+  };
+</script>
+

src/router/config.js

@@ -1427,6 +1427,14 @@ export default {
                 title: '团控列表'
               },
             },
+            { 
+              path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
+              name: 'priceIncomeConfirmInfo',
+              component: resolve => require(['@/components/TravelManager/TravelList//priceIncomeConfirmInfo'], resolve),
+              meta: {
+                title: '收入确认单'
+              },
+            },
             {
               //团控列表 自主开团
               path: '/TravelControlListSale',