Commit 07cbd2dd authored by liudong1993's avatar liudong1993

1

parent 8f75ae78
...@@ -729,7 +729,7 @@ ...@@ -729,7 +729,7 @@
</el-select> </el-select>
</div> </div>
<div class="BillMaking-header-center"> <div class="BillMaking-header-center">
<span>公司:</span> <span>所属公司:</span>
<el-select size="mini" <el-select size="mini"
v-model="BillMaking.RB_Branch_Id" filterable placeholder="请选择公司" v-model="BillMaking.RB_Branch_Id" filterable placeholder="请选择公司"
@change="admin_get_DepartmentGetList"> @change="admin_get_DepartmentGetList">
...@@ -742,7 +742,7 @@ ...@@ -742,7 +742,7 @@
</el-select> </el-select>
</div> </div>
<div class="BillMaking-header-center"> <div class="BillMaking-header-center">
<span>费用归属部门:</span> <span>费用部门:</span>
<el-select size="mini" v-model="BillMaking.RB_Depart_Id" filterable placeholder="请选择部门"> <el-select size="mini" v-model="BillMaking.RB_Depart_Id" filterable placeholder="请选择部门">
<el-option <el-option
v-for="(item,index) in departmentList" v-for="(item,index) in departmentList"
...@@ -758,9 +758,10 @@ ...@@ -758,9 +758,10 @@
@change="getAccountList"> @change="getAccountList">
<el-option <el-option
v-for="(item,index) in AccList" v-for="(item,index) in AccList"
v-if="item.Name =='私帐账户' || item.Name =='公帐账户' || item.Name =='现金账户' || item.Name =='平台账户' || item.Name =='微信支付宝'"
:key="index" :key="index"
:label="item.Name" :label="item.Name"
:value="item.ID"> :value="item.ID" >
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -785,8 +786,7 @@ ...@@ -785,8 +786,7 @@
<div class="BillMakingType-right-list" v-for="(item,index) in airTickets.detailList" :key="index"> <div class="BillMakingType-right-list" v-for="(item,index) in airTickets.detailList" :key="index">
<div class="BillMakingType-right-box"> <div class="BillMakingType-right-box">
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>费用说明:</span> <el-select size="mini" filterable v-model='item.CostTypeId' placeholder="请选择费用">
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="费用说明">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -803,10 +803,10 @@ ...@@ -803,10 +803,10 @@
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>原币:</span> <span>原币:</span>
<span>{{item.OriginalMoney}}</span> <!-- <span>{{item.OriginalMoney}}</span> -->
<!-- <el-input size="mini" placeholder="金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="item.OriginalMoney"></el-input> --> v-model="item.OriginalMoney" disabled></el-input>
</div> </div>
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<el-input <el-input
...@@ -825,6 +825,7 @@ ...@@ -825,6 +825,7 @@
</div> </div>
<div class="BillingTotal-box"> <div class="BillingTotal-box">
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>手续费:</span>
<el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input size="mini" placeholder="请输入手续费" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="airTickets.OriginalFee"></el-input> v-model="airTickets.OriginalFee"></el-input>
</div> </div>
...@@ -833,8 +834,8 @@ ...@@ -833,8 +834,8 @@
<span>{{airTickets.TotalCost}}</span> <span>{{airTickets.TotalCost}}</span>
</div> --> </div> -->
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>应收:</span> <span>应收金额</span>
<span>{{airTickets.WBMoney}}</span> <span style="min-width:50px">{{airTickets.WBMoney}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -846,8 +847,8 @@ ...@@ -846,8 +847,8 @@
<div class="BillMakingType-right-list" v-for="(item,index) in visa.detailList" :key="index"> <div class="BillMakingType-right-list" v-for="(item,index) in visa.detailList" :key="index">
<div class="BillMakingType-right-box"> <div class="BillMakingType-right-box">
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>费用说明:</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="说明"> <el-select size="mini" filterable v-model='item.CostTypeId' placeholder="请选择费用">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -894,8 +895,8 @@ ...@@ -894,8 +895,8 @@
<span>{{visa.TotalCost}}</span> <span>{{visa.TotalCost}}</span>
</div> --> </div> -->
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>应收:</span> <span>应收金额</span>
<span>{{visa.WBMoney}}</span> <span style="min-width:50px">{{visa.WBMoney}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -907,8 +908,8 @@ ...@@ -907,8 +908,8 @@
<div class="BillMakingType-right-list" v-for="(item,index) in ground.detailList" :key="index"> <div class="BillMakingType-right-list" v-for="(item,index) in ground.detailList" :key="index">
<div class="BillMakingType-right-box"> <div class="BillMakingType-right-box">
<div class="BillMakingType-right-center"> <div class="BillMakingType-right-center">
<span>费用说明:</span>
<el-select size="mini" filterable v-model='item.CostTypeId' placeholder="说明"> <el-select size="mini" filterable v-model='item.CostTypeId' placeholder="请选择费用">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -955,8 +956,8 @@ ...@@ -955,8 +956,8 @@
<span>{{ground.TotalCost}}</span> <span>{{ground.TotalCost}}</span>
</div> --> </div> -->
<div class="BillingTotal-center"> <div class="BillingTotal-center">
<span>应收:</span> <span>应收金额</span>
<span>{{ground.WBMoney}}</span> <span style="min-width:50px">{{ground.WBMoney}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -997,10 +998,17 @@ ...@@ -997,10 +998,17 @@
<div class="RemittanceInformation-center"> <div class="RemittanceInformation-center">
<span>汇款人:</span> <span>汇款人:</span>
<div class="RemittanceInformation-center-right"> <div class="RemittanceInformation-center-right">
<el-input size="mini" placeholder="汇款信息" <el-input size="mini" placeholder="请输入汇款人"
v-model="BillMaking.RemitterName"></el-input> v-model="BillMaking.RemitterName"></el-input>
</div> </div>
</div> </div>
<div class="RemittanceInformation-center">
<span>交易流水号:</span>
<div class="RemittanceInformation-center-right">
<el-input size="mini" placeholder="请输入流水号"
v-model="BillMaking.AccountNumber"></el-input>
</div>
</div>
<div class="RemittanceInformation-center"> <div class="RemittanceInformation-center">
<span>汇款时间:</span> <span>汇款时间:</span>
<div class="RemittanceInformation-center-right"> <div class="RemittanceInformation-center-right">
...@@ -1014,13 +1022,6 @@ ...@@ -1014,13 +1022,6 @@
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div class="RemittanceInformation-center">
<span>交易流水号:</span>
<div class="RemittanceInformation-center-right">
<el-input size="mini" placeholder="流水"
v-model="BillMaking.AccountNumber"></el-input>
</div>
</div>
</div> </div>
</div> </div>
<div v-if="total>0"> <div v-if="total>0">
......
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