Commit 012a9739 authored by 黄媛媛's avatar 黄媛媛

update

parent ae6518f4
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th> <th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th> <th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th> <th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th v-show="huijiShow" rowspan="2" width="150">会计费用</th> <th v-show="huijiShow" rowspan="2" width="150">凭证费用</th>
</tr> </tr>
<tr> <tr>
<th width="88">{{$t('fnc.yuanbi')}}</th> <th width="88">{{$t('fnc.yuanbi')}}</th>
......
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th> <th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th> <th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th> <th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th v-show="huijiShow" rowspan="2" width="150">会计费用</th> <th v-show="huijiShow" rowspan="2" width="150">凭证费用</th>
</tr> </tr>
<tr> <tr>
<th width="88">{{$t('fnc.yuanbi')}}</th> <th width="88">{{$t('fnc.yuanbi')}}</th>
......
...@@ -286,6 +286,22 @@ ...@@ -286,6 +286,22 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<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-col :span="4">
<el-form-item label="只查询凭证:">
<el-select filterable v-model='msg.IsSelectKJSetCostType' >
<el-option :value="0" label="否"></el-option>
<el-option :value="1" label="是"></el-option>
</el-select>
</el-form-item>
</el-col>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
...@@ -802,6 +818,8 @@ export default { ...@@ -802,6 +818,8 @@ export default {
QStartDate:'', QStartDate:'',
UpdateBy:'', UpdateBy:'',
IsFormRecPayQuery:'1', IsFormRecPayQuery:'1',
KJCostTypeId:0,
IsSelectKJSetCostType:0,
Sort:'2', Sort:'2',
EmployeeId:'', EmployeeId:'',
}, },
...@@ -1027,6 +1045,8 @@ export default { ...@@ -1027,6 +1045,8 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1; if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0; if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0; if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true; this.loading= true;
this.apipost('Financial_post_GetALLPageList',this.msg,res=>{ this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
...@@ -1075,6 +1095,8 @@ export default { ...@@ -1075,6 +1095,8 @@ export default {
if(!this.msg.Conditon)this.msg.Conditon=1; if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0; if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0; if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls"); this.GetLocalFile("Financial_post_DownInOrOut", this.msg,"收支款.xls");
} , } ,
financeRemove(id){//作废 financeRemove(id){//作废
...@@ -1367,6 +1389,8 @@ export default { ...@@ -1367,6 +1389,8 @@ export default {
OrderID:this.msg.OrderID==0?'':this.msg.OrderID, OrderID:this.msg.OrderID==0?'':this.msg.OrderID,
Sort:this.msg.Sort, Sort:this.msg.Sort,
EmployeeId:this.msg.EmployeeId, EmployeeId:this.msg.EmployeeId,
KJCostTypeId:this.msg.KJCostTypeId==0?'':this.msg.KJCostTypeId,
IsSelectKJSetCostType:this.msg.IsSelectKJSetCostType==0?'':this.msg.IsSelectKJSetCostType,
} }
this.msg = msg; this.msg = msg;
}, },
......
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