Skip to content

S
SuperMan
Commit c7570731 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent b0602c73
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 171 deletions
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ c7570731
...@@ -445,12 +445,14 @@ ...@@ -445,12 +445,14 @@
<input v-model="da.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input> <input v-model="da.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td height="26px"> <td height="26px">
<el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @input="chages($event)" <el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text"
@blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input> @input="chages($event)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)"
class="w80 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice',true)" @input="chages($event)" <el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice',true)"
@change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></el-input> @input="chages($event)" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)"
class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<span class="w80">{{da.currenName}}</span> <span class="w80">{{da.currenName}}</span>
...@@ -462,8 +464,8 @@ ...@@ -462,8 +464,8 @@
</td> </td>
<td height="26px">{{da.bTotalPrice}}</td> <td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"> <td height="26px">
<el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1" @input="chages($event)"></el-input> <i <el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1" @input="chages($event)">
@click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i> </el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -482,13 +484,13 @@ ...@@ -482,13 +484,13 @@
<input v-model="detailList.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input> <input v-model="detailList.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td> <td>
<el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @input="chages($event)" <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')"
@blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input> @input="chages($event)" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td> <td>
<el-input v-model="detailList.UnitPrice" type="text" <el-input v-model="detailList.UnitPrice" type="text"
@keyup.native="checkPrice(detailList,'UnitPrice',true)" @change="Calculation(1)" @blur="addList(1)" @input="chages($event)" @keyup.native="checkPrice(detailList,'UnitPrice',true)" @change="Calculation(1)" @blur="addList(1)"
class="w80 h34 _border_b_1"></el-input> @input="chages($event)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td> <td>
<span class="w110">{{detailList.currenName}}</span> <span class="w110">{{detailList.currenName}}</span>
...@@ -500,7 +502,8 @@ ...@@ -500,7 +502,8 @@
</td> </td>
<td>{{detailList.bTotalPrice}}</td> <td>{{detailList.bTotalPrice}}</td>
<td> <td>
<el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1" @input="chages($event)"> <el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1"
@input="chages($event)">
</el-input> </el-input>
</td> </td>
</tr> </tr>
...@@ -586,68 +589,67 @@ ...@@ -586,68 +589,67 @@
</el-option> </el-option>
</el-select> </el-select>
</span></p> </span></p>
<template v-if="(orderObj&&!orderObj.isPrestore)||msg.SigningCustomerId||msg.DepositCustomerId"> <template v-if="(orderObj&&!orderObj.isPrestore)||msg.SigningCustomerId||msg.DepositCustomerId">
<template v-if="!msg.DepositCustomerId"> <template v-if="!msg.DepositCustomerId">
<p v-if="CustomerIdList&&CustomerIdList.length" style="margin-left: 15px;">签约客户：<span> <p v-if="CustomerIdList&&CustomerIdList.length" style="margin-left: 15px;">签约客户：<span>
<el-select clearable filterable v-model='msg.SigningCustomerId' class="w135 _border_b_1" <el-select clearable filterable v-model='msg.SigningCustomerId' class="w135 _border_b_1"
:disabled="isDepositCustomer" :disabled="isDepositCustomer" @change="getSigningCustomerId(1)">
@change="getSigningCustomerId(1)">
<el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId' <el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId'
:key='item.customerId'> :key='item.customerId'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</p> </p>
</template> </template>
<template v-if="!msg.SigningCustomerId"> <template v-if="!msg.SigningCustomerId">
<p v-if="StoredCustomerList&&StoredCustomerList.length" style="margin-left: 15px;">预收抵用：<span> <p v-if="StoredCustomerList&&StoredCustomerList.length" style="margin-left: 15px;">预收抵用：<span>
<el-select clearable filterable v-model='msg.DepositCustomerId' class="w135 _border_b_1" <el-select clearable filterable v-model='msg.DepositCustomerId' class="w135 _border_b_1"
:disabled="isDepositCustomer" :disabled="isDepositCustomer" @change="getSigningCustomerId(2)">
@change="getSigningCustomerId(2)">
<el-option v-for='item in StoredCustomerList' :label='item.customerName' :value='item.customerId' <el-option v-for='item in StoredCustomerList' :label='item.customerName' :value='item.customerId'
:key='item.customerId'> :key='item.customerId'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</p> </p>
</template>
</template> </template>
</template>
</div> </div>
<table v-if="ContractCustomer" class="Receipt_table" border="1" bordercolor="#c94052" <table v-if="ContractCustomer" class="Receipt_table" border="1" bordercolor="#c94052"
style="border-collapse:collapse;margin-top: 10px;"> style="border-collapse:collapse;margin-top: 10px;">
<tr> <tr>
<th>签约客户</th> <th>签约客户</th>
<th>联系人</th> <th>联系人</th>
<th>手机号</th> <th>手机号</th>
<th>签约到期时间</th> <th>签约到期时间</th>
<th>签约金额</th> <th>签约金额</th>
<th>待结算金额</th> <th>待结算金额</th>
</tr> </tr>
<tr class="_color_b"> <tr class="_color_b">
<td height="26px">{{ContractCustomer.customerName?ContractCustomer.customerName:'-'}}</td> <td height="26px">{{ContractCustomer.customerName?ContractCustomer.customerName:'-'}}</td>
<td height="26px">{{ContractCustomer.contact?ContractCustomer.contact:'-'}}</td> <td height="26px">{{ContractCustomer.contact?ContractCustomer.contact:'-'}}</td>
<td height="26px">{{ContractCustomer.contactNumber?ContractCustomer.contactNumber:'-'}}</td> <td height="26px">{{ContractCustomer.contactNumber?ContractCustomer.contactNumber:'-'}}</td>
<td height="26px">{{ContractCustomer.signingEndTimet?ContractCustomer.signingEndTimet:'-'}}</td> <td height="26px">{{ContractCustomer.signingEndTimet?ContractCustomer.signingEndTimet:'-'}}</td>
<td height="26px">{{ContractCustomer.signingPrice?ContractCustomer.signingPrice:'-'}}</td> <td height="26px">{{ContractCustomer.signingPrice?ContractCustomer.signingPrice:'-'}}</td>
<td height="26px">{{ContractCustomer.signingUnsettledPrice?ContractCustomer.signingUnsettledPrice:'-'}}</td> <td height="26px">{{ContractCustomer.signingUnsettledPrice?ContractCustomer.signingUnsettledPrice:'-'}}
</tr> </td>
</table> </tr>
<table v-if="DepositCustomer" class="Receipt_table" border="1" bordercolor="#c94052" </table>
<table v-if="DepositCustomer" class="Receipt_table" border="1" bordercolor="#c94052"
style="border-collapse:collapse;margin-top: 10px;"> style="border-collapse:collapse;margin-top: 10px;">
<tr> <tr>
<th>预存客户</th> <th>预存客户</th>
<th>联系人</th> <th>联系人</th>
<th>手机号</th> <th>手机号</th>
<th>余额 </th> <th>余额 </th>
</tr> </tr>
<tr class="_color_b"> <tr class="_color_b">
<td height="26px">{{DepositCustomer.customerName?DepositCustomer.customerName:'-'}}</td> <td height="26px">{{DepositCustomer.customerName?DepositCustomer.customerName:'-'}}</td>
<td height="26px">{{DepositCustomer.contact?DepositCustomer.contact:'-'}}</td> <td height="26px">{{DepositCustomer.contact?DepositCustomer.contact:'-'}}</td>
<td height="26px">{{DepositCustomer.contactNumber?DepositCustomer.contactNumber:'-'}}</td> <td height="26px">{{DepositCustomer.contactNumber?DepositCustomer.contactNumber:'-'}}</td>
<td height="26px">{{DepositCustomer.depositMoney?DepositCustomer.depositMoney:'-'}}</td> <td height="26px">{{DepositCustomer.depositMoney?DepositCustomer.depositMoney:'-'}}</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="_remark"> <div class="_remark">
<p>{{$t('system.label_info')}}</p> <p>{{$t('system.label_info')}}</p>
...@@ -695,10 +697,9 @@ ...@@ -695,10 +697,9 @@
<label> <label>
<!-- {{$t('fnc.xiayibu')}} --> <!-- {{$t('fnc.xiayibu')}} -->
下一步审核人：<span class="red">{{msg.AuditDescription}}</span></label> 下一步审核人：<span class="red">{{msg.AuditDescription}}</span></label>
<!-- $t('rule.qxzxybshren') --> <!-- $t('rule.qxzxybshren') -->
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote <el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote
reserve-keyword placeholder="请输入下一步审核人，并选中下" :remote-method="remoteMethod" reserve-keyword placeholder="请输入下一步审核人，并选中下" :remote-method="remoteMethod" :loading="loadingPeople">
:loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId"> <el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span> <span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span> <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
...@@ -873,8 +874,8 @@ ...@@ -873,8 +874,8 @@
tradeWay: '', tradeWay: '',
platformAccount: '', platformAccount: '',
Handmsg: {}, Handmsg: {},
crmOrderObj:null, crmOrderObj: null,
tradeObj:{}, tradeObj: {},
StandardCurrencyId: 0, StandardCurrencyId: 0,
StandardCurrencyName: '', StandardCurrencyName: '',
TCID: 0, TCID: 0,
...@@ -886,7 +887,7 @@ ...@@ -886,7 +887,7 @@
deleteRow(i, obj) { deleteRow(i, obj) {
obj.show = false; obj.show = false;
this.msg.detailList.splice(i, 1); this.msg.detailList.splice(i, 1);
if(this.bankType==12){ if (this.bankType == 12) {
this.getcommission() this.getcommission()
this.countFee(); this.countFee();
} }
...@@ -1125,7 +1126,7 @@ ...@@ -1125,7 +1126,7 @@
this.$forceUpdate(); this.$forceUpdate();
} }
}, },
getAccName(i, o,t) { // 根据选择账户获取账户名 getAccName(i, o, t) { // 根据选择账户获取账户名
this.accountList.forEach(x => { this.accountList.forEach(x => {
if (x.ID == i) { if (x.ID == i) {
this.AccountNumber = x.allName; this.AccountNumber = x.allName;
...@@ -1153,12 +1154,12 @@ ...@@ -1153,12 +1154,12 @@
this.shouxufei = res.data.data this.shouxufei = res.data.data
}, err => {}) }, err => {})
} else { } else {
if (!this.$route.query.edit&&!t) { if (!this.$route.query.edit && !t) {
this.msg.OriginalFee = 0 this.msg.OriginalFee = 0
this.msg.Fee = 0 this.msg.Fee = 0
} }
} }
if(this.bankType==12){//如果等于平台账户 进去判断 if (this.bankType == 12) { //如果等于平台账户 进去判断
this.getcommission() this.getcommission()
this.countFee(); this.countFee();
} }
...@@ -1175,8 +1176,8 @@ ...@@ -1175,8 +1176,8 @@
} }
}, err => {}) }, err => {})
}, },
getAccountList(i,t) { //获取账户类型对应下的账户列表 getAccountList(i, t) { //获取账户类型对应下的账户列表
if(!t){ if (!t) {
this.msg.BankList[0].AccountId = ''; this.msg.BankList[0].AccountId = '';
this.AccountNumber = ''; this.AccountNumber = '';
} }
...@@ -1187,20 +1188,20 @@ ...@@ -1187,20 +1188,20 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
let list= [] let list = []
if(this.$route.query.id==192){//如果流程等于192 只显示地接部专户 10月8号新增 if (this.$route.query.id == 192) { //如果流程等于192 只显示地接部专户 10月8号新增
list= [] list = []
data.forEach(x=>{ data.forEach(x => {
if(x.Alias=='国内地接专户'){ if (x.Alias == '国内地接专户') {
x.allName = x.BackNo + "(" + x.Alias + ")"; x.allName = x.BackNo + "(" + x.Alias + ")";
x.Name = x.Alias; x.Name = x.Alias;
list.push(x) list.push(x)
} }
}) })
}else{//如果不是192的情况不显示 国内地接专户 } else { //如果不是192的情况不显示 国内地接专户
list= [] list = []
data.forEach(x=>{ data.forEach(x => {
if(x.Alias!='国内地接专户'){ if (x.Alias != '国内地接专户') {
x.allName = x.BackNo + "(" + x.Alias + ")"; x.allName = x.BackNo + "(" + x.Alias + ")";
x.Name = x.Alias; x.Name = x.Alias;
list.push(x) list.push(x)
...@@ -1211,12 +1212,12 @@ ...@@ -1211,12 +1212,12 @@
if (this.$route.query.edit) { if (this.$route.query.edit) {
this.getAccName(this.msg.BankList[0].AccountId) this.getAccName(this.msg.BankList[0].AccountId)
} }
if(t){ if (t) {
let isState = true let isState = true
this.accountList.forEach(item=>{ this.accountList.forEach(item => {
if(isState&&item.ID===this.msg.BankList[0].AccountId){ if (isState && item.ID === this.msg.BankList[0].AccountId) {
this.detailList.Rate = item.Rate this.detailList.Rate = item.Rate
this.msg.detailList.forEach(x=>{ this.msg.detailList.forEach(x => {
x.Rate = item.Rate x.Rate = item.Rate
}) })
isState = false isState = false
...@@ -1224,11 +1225,11 @@ ...@@ -1224,11 +1225,11 @@
} }
}) })
if(isState){ if (isState) {
this.msg.BankList[0].AccountId = ''; this.msg.BankList[0].AccountId = '';
this.AccountNumber = ''; this.AccountNumber = '';
} }
this.getAccName(this.msg.BankList[0].AccountId,1,1) this.getAccName(this.msg.BankList[0].AccountId, 1, 1)
// this.Calculation(0,1) // this.Calculation(0,1)
// this.countFee() // this.countFee()
} }
...@@ -1350,13 +1351,13 @@ ...@@ -1350,13 +1351,13 @@
}) })
} }
}) })
if(this.$route.query.id==192){//如果流程等于192 只显示地接部专户 10月8号新增 if (this.$route.query.id == 192) { //如果流程等于192 只显示地接部专户 10月8号新增
newAccList=[] newAccList = []
AccList.forEach(y => { AccList.forEach(y => {
if ( y.Name == '地接部专户' ) { if (y.Name == '地接部专户') {
newAccList.push(y) newAccList.push(y)
} }
}) })
} }
this.AccList = newAccList; this.AccList = newAccList;
} else { } else {
...@@ -1371,12 +1372,15 @@ ...@@ -1371,12 +1372,15 @@
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
}, },
AddFinancial(z) { //保存 AddFinancial(z) { //保存
if((this.orderObj&&!this.orderObj.isPrestore)||this.msg.DepositCustomerId){ if ((this.orderObj && !this.orderObj.isPrestore) || this.msg.DepositCustomerId) {
let To = Number(this.allPrice+this.msg.Fee) let To = Number(this.allPrice + this.msg.Fee)
let totalAmount = this.DepositCustomer.depositMoney let totalAmount = 0;
if(To > totalAmount){ if (this.DepositCustomer && this.DepositCustomer.depositMoney) {
this.Error(`本位币总金额需小于等于${this.DepositCustomer.depositMoney}！`) totalAmount = this.DepositCustomer.depositMoney;
return if (To > totalAmount) {
this.Error(`本位币总金额需小于等于${this.DepositCustomer.depositMoney}！`)
return
}
} }
} }
if (this.Handmsg != null) { if (this.Handmsg != null) {
...@@ -1424,22 +1428,22 @@ ...@@ -1424,22 +1428,22 @@
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0; this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0; this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : []; this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName?this.orderObj.StandardCurrencyName:''; this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName ? this.orderObj.StandardCurrencyName : '';
} }
// 原币总金验证 // 原币总金验证
if(this.orderObj&&this.orderObj.Money){ if (this.orderObj && this.orderObj.Money) {
let yballPrice = 0 let yballPrice = 0
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{ this.msg && this.msg.detailList && this.msg.detailList.forEach((item, i) => {
yballPrice += Number(item.UnitPrice) yballPrice += Number(item.UnitPrice)
}) })
this.yballPriceTo = yballPrice this.yballPriceTo = yballPrice
if(this.orderObj.Money!=this.yballPriceTo){ if (this.orderObj.Money != this.yballPriceTo) {
this.Error(`原币总金额需等于${this.orderObj.Money}！`) this.Error(`原币总金额需等于${this.orderObj.Money}！`)
return return
}
} }
}
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
if(this.crmOrderObj){ if (this.crmOrderObj) {
this.msg.OtherType = this.crmOrderObj.OtherType this.msg.OtherType = this.crmOrderObj.OtherType
this.msg.ReFinanceId = this.crmOrderObj.ReFinanceId this.msg.ReFinanceId = this.crmOrderObj.ReFinanceId
this.msg.ReFinanceId2 = this.crmOrderObj.ReFinanceId2 this.msg.ReFinanceId2 = this.crmOrderObj.ReFinanceId2
...@@ -1447,7 +1451,7 @@ ...@@ -1447,7 +1451,7 @@
this.msg.RelevanceFrId = this.crmOrderObj.RelevanceFrId this.msg.RelevanceFrId = this.crmOrderObj.RelevanceFrId
} }
// 同业的参数 // 同业的参数
if(this.tradeObj.OtherType){ if (this.tradeObj.OtherType) {
this.msg.OtherType = this.tradeObj.OtherType this.msg.OtherType = this.tradeObj.OtherType
this.msg.ReFinanceId = this.tradeObj.ReFinanceId this.msg.ReFinanceId = this.tradeObj.ReFinanceId
this.msg.ReFinanceId2 = this.tradeObj.ReFinanceId2 this.msg.ReFinanceId2 = this.tradeObj.ReFinanceId2
...@@ -1578,35 +1582,35 @@ ...@@ -1578,35 +1582,35 @@
if (this.shouxufei > 0) { if (this.shouxufei > 0) {
this.shouxufeiJiSuan() this.shouxufeiJiSuan()
} }
if(this.bankType==12){ if (this.bankType == 12) {
this.getcommission() this.getcommission()
} }
this.countFee(); this.countFee();
}, },
getcommission(){//计算手续费 满足平台账户 而且是结算方式为百分比 SettlementType=1 getcommission() { //计算手续费 满足平台账户 而且是结算方式为百分比 SettlementType=1
let obj = null let obj = null
for(let i=0;i< this.accountList.length;i++){ for (let i = 0; i < this.accountList.length; i++) {
let x = this.accountList[i] let x = this.accountList[i]
if(x.ID == this.msg.BankList[0].AccountId){ if (x.ID == this.msg.BankList[0].AccountId) {
obj={ obj = {
SettlementType:x.SettlementType, SettlementType: x.SettlementType,
Commission:x.Commission Commission: x.Commission
} }
break break
} }
} }
let price = 0 let price = 0
if(obj.SettlementType==1){ if (obj.SettlementType == 1) {
if(this.msg.detailList && this.msg.detailList.length>0){ if (this.msg.detailList && this.msg.detailList.length > 0) {
this.msg.detailList.forEach(x=>{ this.msg.detailList.forEach(x => {
if(Number(x.yTotalPrice) > 0){ if (Number(x.yTotalPrice) > 0) {
price = price + Number(x.yTotalPrice) price = price + Number(x.yTotalPrice)
} }
}) })
} }
this.msg.OriginalFee = Math.round((price * obj.Commission) ) / 100; this.msg.OriginalFee = Math.round((price * obj.Commission)) / 100;
}else{ } else {
this.msg.OriginalFee = 0 this.msg.OriginalFee = 0
this.msg.Fee = 0 this.msg.Fee = 0
} }
...@@ -1711,7 +1715,7 @@ ...@@ -1711,7 +1715,7 @@
this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee); this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee);
this.$forceUpdate(); this.$forceUpdate();
}, },
chages(){ chages() {
this.$forceUpdate() this.$forceUpdate()
}, },
...@@ -1772,9 +1776,9 @@ ...@@ -1772,9 +1776,9 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
this.msg = JSON.parse(JSON.stringify(data)); this.msg = JSON.parse(JSON.stringify(data));
this.msg.SigningCustomerId = data.SigningCustomerId?Number(data.SigningCustomerId):'' this.msg.SigningCustomerId = data.SigningCustomerId ? Number(data.SigningCustomerId) : ''
this.msg.DepositCustomerId = data.DepositCustomerId?Number(data.DepositCustomerId):'' this.msg.DepositCustomerId = data.DepositCustomerId ? Number(data.DepositCustomerId) : ''
if(this.msg.DepositCustomerId) this.isDepositCustomer = true if (this.msg.DepositCustomerId) this.isDepositCustomer = true
let obj = { let obj = {
AccountId: '', AccountId: '',
CurrencyId: '', CurrencyId: '',
...@@ -1902,24 +1906,24 @@ ...@@ -1902,24 +1906,24 @@
}, err => {}) }, err => {})
}, },
admin_get_DepartmentGetList(Bid, T) { // 获取部门 admin_get_DepartmentGetList(Bid, T) { // 获取部门
if(this.bankType){ if (this.bankType) {
this.getAccountList(this.bankType,1) this.getAccountList(this.bankType, 1)
} }
this.msg.detailList.forEach(x=>{ this.msg.detailList.forEach(x => {
x.Rate = '' x.Rate = ''
}) })
this.detailList.Rate = '' this.detailList.Rate = ''
let isShow = true let isShow = true
if(this.msg.RB_Branch_Id){ if (this.msg.RB_Branch_Id) {
this.companyList.forEach(item=>{ this.companyList.forEach(item => {
if(this.msg.RB_Branch_Id==item.Id&&item.StandardCurrencyId>0){ if (this.msg.RB_Branch_Id == item.Id && item.StandardCurrencyId > 0) {
this.StandardCurrencyId = item.StandardCurrencyId this.StandardCurrencyId = item.StandardCurrencyId
this.StandardCurrencyName = item.StandardCurrencyName this.StandardCurrencyName = item.StandardCurrencyName
isShow = false isShow = false
} }
}) })
} }
if(isShow){ if (isShow) {
this.StandardCurrencyId = -1 this.StandardCurrencyId = -1
this.StandardCurrencyName = '' this.StandardCurrencyName = ''
} }
...@@ -1937,25 +1941,25 @@ ...@@ -1937,25 +1941,25 @@
} }
}, err => {}) }, err => {})
}, },
getSigningCustomerId(type){ getSigningCustomerId(type) {
// 1 签约客户 2 预存客户抵用 // 1 签约客户 2 预存客户抵用
if(type==1){ if (type == 1) {
if(!this.msg.SigningCustomerId){ if (!this.msg.SigningCustomerId) {
this.ContractCustomer = null this.ContractCustomer = null
} }
this.CustomerIdList.forEach(item=>{ this.CustomerIdList.forEach(item => {
if(item.customerId==this.msg.SigningCustomerId){ if (item.customerId == this.msg.SigningCustomerId) {
this.ContractCustomer = item this.ContractCustomer = item
} }
}) })
this.msg.DepositCustomerId = '' this.msg.DepositCustomerId = ''
this.DepositCustomer = null this.DepositCustomer = null
}else if(type==2){ } else if (type == 2) {
if(!this.msg.DepositCustomerId){ if (!this.msg.DepositCustomerId) {
this.DepositCustomer = null this.DepositCustomer = null
} }
this.StoredCustomerList.forEach(item=>{ this.StoredCustomerList.forEach(item => {
if(item.customerId==this.msg.DepositCustomerId){ if (item.customerId == this.msg.DepositCustomerId) {
this.DepositCustomer = item this.DepositCustomer = item
} }
}) })
...@@ -1965,24 +1969,27 @@ ...@@ -1965,24 +1969,27 @@
}, },
getCustomerIdList() { getCustomerIdList() {
this.apipost( this.apipost(
"app_today_visit_GetMySigningCustomerList", "app_today_visit_GetMySigningCustomerList", {
{pageIndex: 1,pageSize: 1000,CustomerStatus: 0}, pageIndex: 1,
res => { pageSize: 1000,
if (res.data.resultCode == 1) { CustomerStatus: 0
},
res => {
if (res.data.resultCode == 1) {
this.CustomerIdList = res.data.data.signingList; this.CustomerIdList = res.data.data.signingList;
this.StoredCustomerList = res.data.data.depositList this.StoredCustomerList = res.data.data.depositList
if(this.msg.SigningCustomerId||this.msg.DepositCustomerId){ if (this.msg.SigningCustomerId || this.msg.DepositCustomerId) {
let type = this.msg.SigningCustomerId?1:2 let type = this.msg.SigningCustomerId ? 1 : 2
this.getSigningCustomerId(type) this.getSigningCustomerId(type)
} }
} else { } else {
this.loading = false; this.loading = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, },
err => {}, err => {},
); );
}, },
getCompany() { // 获取公司 getCompany() { // 获取公司
this.apipost('admin_get_BranchGetList', this.companyMsg, res => { this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
let data = res.data.data; let data = res.data.data;
...@@ -2006,14 +2013,14 @@ ...@@ -2006,14 +2013,14 @@
}); });
} }
this.companyList = data; this.companyList = data;
if(this.msg.RB_Branch_Id){ if (this.msg.RB_Branch_Id) {
this.companyList.forEach(item=>{ this.companyList.forEach(item => {
if(this.msg.RB_Branch_Id==item.Id&&item.StandardCurrencyId>0){ if (this.msg.RB_Branch_Id == item.Id && item.StandardCurrencyId > 0) {
this.StandardCurrencyId = item.StandardCurrencyId this.StandardCurrencyId = item.StandardCurrencyId
this.StandardCurrencyName = item.StandardCurrencyName this.StandardCurrencyName = item.StandardCurrencyName
} }
}) })
} }
if (!Status) { if (!Status) {
let id = this.$route.query.id; let id = this.$route.query.id;
this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', { this.apipost('FinancialFlowTemplate_post_GetTemplateBranch', {
...@@ -2044,18 +2051,19 @@ ...@@ -2044,18 +2051,19 @@
this.tradeWay = this.$route.query.tradeWay ? this.$route.query.tradeWay : 0; this.tradeWay = this.$route.query.tradeWay ? this.$route.query.tradeWay : 0;
this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0; this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){ if (this.$route.query.crmOrderObj) {
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj); this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
}else if(this.$route.query.tradeObj){//同业参数 } else if (this.$route.query.tradeObj) { //同业参数
this.tradeObj = JSON.parse(this.$route.query.tradeObj); this.tradeObj = JSON.parse(this.$route.query.tradeObj);
}else{ } else {
this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null; this.orderObj = this.$route.query.orderObj ? JSON.parse(this.$route.query.orderObj) : null;
if(this.orderObj&&this.orderObj.Money){ if (this.orderObj && this.orderObj.Money) {
this.detailList.UnitPrice = this.orderObj.Money this.detailList.UnitPrice = this.orderObj.Money
} }
} }
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0 let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length > 0) ? this.orderObj
.TCIDList[0] : 0
this.TCID = TCID this.TCID = TCID
this.Handmsg = this.$route.query.Handmsg ? JSON.parse(this.$route.query.Handmsg) : null; this.Handmsg = this.$route.query.Handmsg ? JSON.parse(this.$route.query.Handmsg) : null;
......
src/components/Ticketing/TicketTransport.vue
View file @ c7570731
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<th width="110"> <th width="110">
配置数量 配置数量
</th> </th>
<th width="400"> <th width="500">
票务备注 票务备注
</th> </th>
</tr> </tr>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</el-select> </el-select>
</td> </td>
<td rowspan="2"> <td rowspan="2">
<el-select class="w80" filterable v-model="item.UnionCityId" :disabled="true"> <el-select class="w80" filterable v-model="item.UnionCityId">
<el-option label='请选择' :value="selectDefauleValue"></el-option> <el-option label='请选择' :value="selectDefauleValue"></el-option>
<el-option v-for="subItem in cityList" :label='subItem.Name' :value='subItem.ID' <el-option v-for="subItem in cityList" :label='subItem.Name' :value='subItem.ID'
:key="subItem.subCode"> :key="subItem.subCode">
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
去程 去程
</td> </td>
<td> <td>
<el-select class="w95" filterable v-model="item.DayNum" :disabled="true"> <el-select class="w95" filterable v-model="item.DayNum">
<el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID' <el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID'
:key="subItem.subCode"> :key="subItem.subCode">
</el-option> </el-option>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
</td> </td>
<td rowspan="2"> <td rowspan="2">
<el-checkbox v-model="item.IsStay" :checked="item.IsStay===CheckedVaule" :true-label="CheckedVaule" <el-checkbox v-model="item.IsStay" :checked="item.IsStay===CheckedVaule" :true-label="CheckedVaule"
:false-label="UnCheckedVaule" :disabled="true"></el-checkbox> :false-label="UnCheckedVaule"></el-checkbox>
</td> </td>
<td> <td>
<el-input class="w95" v-model="item.AddGoCostPrice" <el-input class="w95" v-model="item.AddGoCostPrice"
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<tr> <tr>
<td>返程</td> <td>返程</td>
<td> <td>
<el-select class="w95" filterable v-model="item.BackDayNum" :disabled="true"> <el-select class="w95" filterable v-model="item.BackDayNum">
<el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID' <el-option v-for="subItem in DayList" :label='subItem.Name' :value='subItem.ID'
:key="subItem.subCode"> :key="subItem.subCode">
</el-option> </el-option>
......
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