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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -627,7 +627,8 @@ export default {
         LineTeamId: "",
         TCID: "",
         startDate: "",
-        endDate: ""
+        endDate: "",
+        Type: 1,
       },
       getCompanyMsg: {
         // 公司

src/components/SalesModule/groupTourOrder.vue

@@ -1192,7 +1192,7 @@
 		<div style="width: 100%; height: auto;  overflow-x: auto;" class="ownScrollbarStyle">
 		<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
 			<tr>
-				<th width="120">单号&团号</th>
+				<th width="240">单号&团号</th>
         <th width="120">客户信息</th>
 				<th width="70">类型</th>
 				<th width="150">系列&线路</th>
@@ -1218,6 +1218,7 @@
 						<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
             <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
             <p style="min-width: 180px;">发团：{{item.startDate}}</p>
+            <p>下单时间：{{item.createDate}}</p>
           </td>
           <td>
 						<p class="fz12 over_ellipsis" style="width: 120px;"  :title="item.contactName">{{item.contactName}}</p>
@@ -1397,26 +1398,27 @@
             </div>
           </td>
 					<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
-						<div>
+						<div  @click="goUrlSFD('SalesFinancialDetail', item.orderId, '销售财务单据', item.tcnum, item.tcid, item.outBranchId)">
 							<div>收款单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.financeList" :key="index2">
-                  <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
+                  <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
+                   <!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
                 </span>
                 <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
               </div>
 						</div>
-            <div>
+            <div @click="goUrlSFD('SalesFinancialDetail', item.orderId, '销售财务单据', item.tcnum, item.tcid, item.outBranchId)">
 							<div>付款单据：</div>
               <div>
                 <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
-                  <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
-                  <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
+                  <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
+                  <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
                 </span>
                 <span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span>
               </div>
@@ -1877,6 +1879,8 @@ export default {
               if (res.data.resultCode == 1) {
                 this.$message.success("取消成功！");
                 this.getList();
+              }else{
+                this.$message.error(res.data.message);
               }
             },
             err => {}
@@ -1943,6 +1947,12 @@ export default {
         }
       }
     },
+    goUrlSFD: function (path, orderId, name, tcnum, tcid, outBranchId) {
+      this.$router.push({
+        name: path,
+        query: { orderId: orderId, blank: 'y', tab: name, tcnum: tcnum, tcid: tcid, outBranchId: outBranchId}
+      });
+    },
     goUrlX(name, path, id, tcmun) {
       this.$router.push({
         name: path,

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2343,6 +2343,8 @@ export default {
               if (res.data.resultCode == 1) {
                 this.$message.success("取消成功！");
                 this.getList();
+              }else{
+                this.$message.error(res.data.message);
               }
             },
             err => {}

src/router/config.js

@@ -2245,6 +2245,13 @@ export default {
               meta: {
                 title: '团队营收变更报表'
               },
+            }, { //财务 报表 联运报表
+              path: '/CombinedRevenueReport',
+              name: 'CombinedRevenueReport',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/CombinedRevenueReport'], resolve),
+              meta: {
+                title: '团队营收变更报表'
+              },
             }, { // 销售   制作广告
               path: '/advert',
               name: 'advert',