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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1113,9 +1113,11 @@
                       <el-dropdown-item v-if="item.IsSetOut==1">
                         <div @click='setIsSetOutOffer(item,0)'>正常发团 </div>
                       </el-dropdown-item>
+                      <el-dropdown-item>
+                        <div @click='GoToleaderReimbursement(item)' style="color:red">地接成本支出 </div>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
-
                   <el-button v-if="item.LineID==14||item.LineID==118" @click.native='PushMessage(item)' type="primary"
                     style="background:#00C6FF; border-color:#00C6FF;margin-top:5px;">推送消息
                   </el-button>
@@ -1509,6 +1511,22 @@
       },
     },
     methods: {
+      //跳转到用款计划
+      GoToleaderReimbursement(item) {
+        this.$router.push({
+          path: "leaderReimbursement",
+          query: {
+            id: item.TCIDStr,
+            NewCombinationNum: item.CombinationNum,
+            isUpdate: true,
+            tab: "地接成本支出",
+            lineId: item.LineID,
+            OutBranchId: item.OutBranchId,
+            blank: "y"
+          }
+        });
+      },
+      //推送消息
       PushMessage(item) {
         var pMsg = {
           TCID: item.TCID
@@ -1651,7 +1669,6 @@
         let msg = {};
         msg.groupRecommendType = num;
         msg.tcid = item.TCID;
-
         this.apipost(
           "travel_post_SetGroupRecommendType",
           msg,
@@ -1688,7 +1705,6 @@
             }
           });
         }
-
       },
       //翻页
       handleCurrentChange(val) {

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -754,6 +754,9 @@
                       </el-dropdown-item>
                       <el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">重新提交审核
                       </el-dropdown-item>
+                      <el-dropdown-item>
+                        <div @click='GoToleaderReimbursement(item)' style="color:red">地接成本支出 </div>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
 
@@ -1014,6 +1017,22 @@
       };
     },
     methods: {
+      //跳转到用款计划
+      GoToleaderReimbursement(item) {
+        this.$router.push({
+          path: "leaderReimbursement",
+          query: {
+            id: item.TCIDStr,
+            NewCombinationNum: item.CombinationNum,
+            isUpdate: true,
+            tab: "地接成本支出",
+            lineId: item.LineID,
+            OutBranchId: item.OutBranchId,
+            blank: "y"
+          }
+        });
+      },
+      //消息推送
       PushMessage(item) {
         var pMsg = {
           TCID: item.TCID

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -681,6 +681,9 @@
                       </el-dropdown-item>
                       <el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}}
                       </el-dropdown-item>
+                      <el-dropdown-item>
+                        <div @click='GoToleaderReimbursement(item)' style="color:red">地接成本支出 </div>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
 
@@ -980,6 +983,22 @@
       }
     },
     methods: {
+      //跳转到用款计划
+      GoToleaderReimbursement(item) {
+        this.$router.push({
+          path: "leaderReimbursement",
+          query: {
+            id: item.TCIDStr,
+            NewCombinationNum: item.CombinationNum,
+            isUpdate: true,
+            tab: "地接成本支出",
+            lineId: item.LineID,
+            OutBranchId: item.OutBranchId,
+            blank: "y"
+          }
+        });
+      },
+      //消息推送
       PushMessage(item) {
         var pMsg = {
           TCID: item.TCID