s

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -2,9 +2,20 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
-        <li><span><em>系列</em>
+        <li>
+          <span>
+            <em>所属线路</em>
+            <el-select class="w150" v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(msg.LineId)">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>系列</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
-              <el-option label="不限" value='-1'></el-option>
+              <el-option label="不限" :value='0'></el-option>
               <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
               </el-option>
             </el-select>
@@ -193,8 +204,8 @@
           pageSize: 8,
           //购物店
           SelectType: 7,
-          LineId: 14,
-          LineteamId: "-1",
+          LineId: 0,
+          LineteamId: 0,
           StartDate: '',
           EndDate: '',
           currentPage: 1,
@@ -232,12 +243,12 @@
         this.LineTeamList = [];
         this.apipost(
           "team_post_GetList", {
-            lineID: 14,
+            lineID: lineId,
             isTOOP: 1
           },
           res => {
             if (res.data.resultCode == 1) {
-              this.msg.LineteamId = "-1";
+              this.msg.LineteamId = 0;
               this.LineTeamList = res.data.data;
             }
           }
@@ -362,8 +373,8 @@
         myDate.getDate();
       this.msg.StartDate = nowDate;
       //this.msg.StartDate = '2019-01-01';
-      this.getLineTeamList();
-      this.getList()
+      this.getLineList();
+      this.getList();
     },
   }
 

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -23,6 +23,7 @@
         <th width="150">餐厅</th>
         <th width="150">门票</th>
         <th width="150">车资</th>
+        <th width="150">其它</th>
         <th width="150">总计</th>
       </tr>
       <tr v-for="item in msgList">
@@ -31,7 +32,8 @@
         <td>{{moneyFormat(eatPay)}}</td>
         <td>{{moneyFormat(ticketPay)}}</td>
         <td>{{moneyFormat(busPay)}}</td>
-        <td>{{moneyFormat(hotelPay+eatPay+ticketPay+busPay)}}</td>
+        <td>{{moneyFormat(otherPay)}}</td>
+        <td>{{moneyFormat(hotelPay+eatPay+ticketPay+busPay+otherPay)}}</td>
       </tr>
     </table>
     <p class="teamRevenueExpenditureTitle">
@@ -266,6 +268,64 @@
         <td colspan="9" class="color666">没有找到你需要的财务数据</td>
       </tr>
     </table>
+
+     <p class="teamRevenueExpenditureTitle">
+      其它
+      <span class="fr" style="margin-top: -8px;">
+        <input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button" class="normalBtn"
+          value="新增收款" @click="goUrl(14,1)" />
+      </span>
+    </p>
+    <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
+      <tr>
+        <th width="100">序号</th>
+        <th width="10%">单号</th>
+        <th width="10%">费用说明</th>
+        <th width="10%">日期</th>
+        <th width="20%">备注</th>
+        <th width="10%">应付/应付金额</th>
+        <th width="10%">业务员</th>
+        <th>付款凭证</th>
+        <th width="10%">状态</th>
+      </tr>
+      <tr v-for="(item,index) in otherList">
+        <td>{{index+1}}</td>
+        <td><a style="color:blue;cursor:pointer" @click="goFinaceURL(item.FrID)"> {{item.FrID}} </a></td>
+        <td>
+          <span class="padding10" v-for="i in item.CostTypeList">{{i}}</span>
+        </td>
+        <td>{{item.CreateDate}}</td>
+        <td><div v-for="childItem in item.TradeWayList">
+                         支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
+                        <span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
+                        <span class="TB_Rate">汇率：{{childItem.Rate}}</span>
+            </div></td>
+        <td>
+          <span>￥{{item.Type === 2 ? '-' : ''}}{{moneyFormat(item.Money)}}</span>
+        </td>
+        <td>{{item.EmName}}</td>
+        <td>
+          <template v-for="(son,sIndex) in item.VorcherInos">
+            <template v-if="son.Type==1||son.Type==2">
+              <i class="iconfont icon-excel" @click="showUpLoadFile(son)"></i>
+            </template>
+            <template v-if="son.Type==3">
+              <img class="vorcherInosImg" @click="showImg(item.VorcherInos)" :src="son.Content" alt="">
+            </template>
+          </template>
+        </td>
+        <td>{{item.StatusStr}}</td>
+      </tr>
+      <tr v-if='otherList.length!=0'>
+        <td>成本总价</td>
+        <td style="text-align:left;padding-left:5px;" colspan="8">
+          ￥{{getTotalMoney(otherList)}}
+        </td>
+      </tr>
+      <tr v-if='otherList.length==0'>
+        <td colspan="9" class="color666">没有找到你需要的财务数据</td>
+      </tr>
+    </table>
     <div v-if='picIsShow' class="viewBigPicLayer" @click="picIsShow=false,picObj=[]">
       <el-carousel height="600px" :interval="5000" trigger="click">
         <el-carousel-item v-for="(item,index) in picObj" :key="index">
@@ -287,10 +347,12 @@
         eatList: [],
         ticketList: [],
         busList: [],
+        otherList: [],
         hotelPay: 0,
         eatPay: 0,
         ticketPay: 0,
         busPay: 0,
+        otherPay:0,
       }
     },
     methods: {
@@ -347,6 +409,9 @@
             case 5:
               this.busPay = money
               break;
+            case 14:
+              this.otherPay = money
+              break;
             default:
               break;
           }
@@ -406,7 +471,7 @@
           if (res.data.resultCode == 1) {
             switch (type) {
               case 1:
-				this.hotelList = res.data.data
+                this.hotelList = res.data.data
                 break;
               case 2:
                 this.eatList = res.data.data
@@ -417,12 +482,15 @@
               case 5:
                 this.busList = res.data.data
                 break;
+              case 14:
+                this.otherList = res.data.data
+                break;
               default:
                 break;
 
             }
           } else {
-            this.$message.error(res.data.message)
+            this.Error(res.data.message)
           }
         }, err => {})
       }
@@ -432,6 +500,7 @@
       this.getList(2)
       this.getList(3)
       this.getList(5)
+      this.getList(14)
       this.getTuanMsg()
     }
   }