Skip to content

S
SuperMan
Commit 855df755 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 0f803b22 8ff646a2
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 71 deletions
src/components/FinancialModule/Kingdee/RecPayQuery.vue
View file @ 855df755
...@@ -490,19 +490,9 @@ ...@@ -490,19 +490,9 @@
<div class="el-card__header"> <div class="el-card__header">
<el-form class="_info_box" label-width="110px"> <el-form class="_info_box" label-width="110px">
<el-row style="padding:0;"> <el-row style="padding:0;">
<!-- <el-col :span="4">
<el-form-item label="公司：">
<el-select filterable v-model='msg.KingdeeBranchId' placeholder="请选择公司" @keyup.native="checkInteger(msg,'RB_Branch_Id')">
<el-option v-for="(item,index) in TheAliasList" :label="item.Name" :value='item.Id' :key="index">
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item label="模式："> <el-form-item label="模式：">
<el-select style="width: 100%;" filterable collapse-tags v-model='msg.ImportType' <el-select style="width: 100%;" filterable collapse-tags v-model='msg.ImportType' class="">
@change="getDepartment()"
class="">
<el-option v-for='item in ImportTypeList' :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for='item in ImportTypeList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -537,20 +527,6 @@ ...@@ -537,20 +527,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id'
@change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''"
class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="制单人员："> <el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class=""> <el-select filterable v-model='msg.UpdateBy' class="">
...@@ -569,6 +545,7 @@ ...@@ -569,6 +545,7 @@
<el-option key="-1" value="-1" label="不限"></el-option> <el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option> <el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option> <el-option key="2" value="2" label="支出"></el-option>
<el-option key="4" value="4" label="资金调拨"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -581,41 +558,6 @@ ...@@ -581,41 +558,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4">
<el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType'>
<el-option value="" label="不限"></el-option>
<el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :span="4" @click="typeVisible=true">
<el-form-item label="交易方式：">
<el-select filterable v-model='msg.TradeWay'
@change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''">
<el-option value="0" label="不限"></el-option>
<el-option v-for='item in BranchAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8" @click="typeVisible=true">
<el-form-item label="收付款账户：">
<el-row>
<el-col :span="9">
<el-select filterable v-model='msg.BankID'>
<el-option value="" label="不限"></el-option>
<el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-col>
<el-col :span="13">
<el-button class="hollowFixedBtn" type="primary" size="mini" @click="typeVisible=true" >筛选类型/交易/账户</el-button>
</el-col>
</el-row>
</el-form-item>
</el-col> -->
<el-col :span="5"> <el-col :span="5">
<el-form-item label="交易日期："> <el-form-item label="交易日期：">
<el-date-picker class="h34" style="width: 100%;" v-model="transactionDate" @change="timeAdd(3)" type="daterange" <el-date-picker class="h34" style="width: 100%;" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
...@@ -644,7 +586,30 @@ ...@@ -644,7 +586,30 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="金蝶状态：">
<el-select v-model='msg.KingdeeMark'>
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="已导入"></el-option>
<el-option key="2" value="2" label="未导入"></el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="heightQueryBox"> <template v-if="heightQueryBox">
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id'
@change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''"
class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="币种类型："> <el-form-item label="币种类型：">
<el-select filterable v-model='msg.CurrencyId'> <el-select filterable v-model='msg.CurrencyId'>
...@@ -685,15 +650,6 @@ ...@@ -685,15 +650,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="金蝶状态：">
<el-select v-model='msg.KingdeeMark'>
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="已导入"></el-option>
<el-option key="2" value="2" label="未导入"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单日期："> <el-form-item label="制单日期：">
<el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange" <el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
...@@ -720,6 +676,9 @@ ...@@ -720,6 +676,9 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div>
<span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据 </span>
</div>
<div class="query-box" style="padding: 0;border: 0;"> <div class="query-box" style="padding: 0;border: 0;">
<ul class="clearfix"> <ul class="clearfix">
<li class="hight_query" style="text-align: right;"> <li class="hight_query" style="text-align: right;">
...@@ -890,7 +849,9 @@ ...@@ -890,7 +849,9 @@
data() { data() {
return { return {
ImportTypeList:[ ImportTypeList:[
{Name:'团费对接',Id:1} {Name:'团费对接',Id:1},
{Name:'资金调拨',Id:2},
{Name:'团队成本',Id:3},
], ],
showID: false, showID: false,
active: 1, active: 1,
...@@ -942,7 +903,7 @@ ...@@ -942,7 +903,7 @@
AccountIdStr:'', AccountIdStr:'',
ColorType:1,//和平 ColorType:1,//和平
ImportType:1, ImportType:1,
KingdeeMark: '0', KingdeeMark: '2',
}, },
BranchIds:[], BranchIds:[],
getCompanyMsg: { // 公司 getCompanyMsg: { // 公司
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment