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

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -104,6 +104,14 @@
                                 </el-date-picker>
                             </el-form-item>
                     </el-col>
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="费用类型">
+                            <el-select  filterable  v-model='msg.CostTypeID' >
+                              <el-option :value="0" label="不限"></el-option>
+                              <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
 			<ul>
@@ -330,6 +338,7 @@ export default {
                 pageIndex:1,
                 pageSize:5,
                 ClientID:'',
+                CostTypeID:0,
                 sTradeDate:'',
                 eTradeDate:'',
                 QStartDate:'',
@@ -348,6 +357,7 @@ export default {
             productionDate:[],
             productionDateByTC:[],
             ClientAccountList:[],
+            GetCostTypeList:[],
             loading:false,
             date:'',
             accType:'',
@@ -829,12 +839,22 @@ export default {
       //   this.listAllMoney = this.listAllMoney + x.allMoney
       // })
     },
+    financeinfo_post_GetCostTypeList(){  // 费用类型
+            this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
+                if(res.data.resultCode==1){
+                    this.GetCostTypeList = res.data.data;
+                }else{
+
+                }
+            },err=>{})
+    },
     },mounted(){
         let userInfo=this.getLocalStorage();
         this.getAccountTypeList();
         this.AccountType_post_GetList();
         this.BankAccount_post_GetAccountType();
         this.financeinfo_post_GetClientAccountList();
+        this.financeinfo_post_GetCostTypeList();
     }
 }
 </script>
\ No newline at end of file