Skip to content

S
SuperMan
Commit 990f40ef authored by 吴春's avatar 吴春
Browse files
Options

代收代付往来代码提交

parent 82c4ba2c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1836 additions and 109 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 990f40ef
...@@ -875,6 +875,12 @@ ...@@ -875,6 +875,12 @@
<span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;"> <span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="goHand(3,GetDetail)">查看手配详情</span> <span style="text-decoration: underline;" @click="goHand(3,GetDetail)">查看手配详情</span>
</span> </span>
<span v-if="GetDetail.IsRelevanceStatus==1" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="openDetails(GetDetail.FrID,1)">查看代收/代付详情</span>
</span>
<span v-if="GetDetail.NewFinanceId>0 " style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="openDetails(GetDetail.NewFinanceId,2)">查看往来结算详情</span>
</span>
<!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;"> <!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="goHand(4,GetDetail)">查看月结详情</span> <span style="text-decoration: underline;" @click="goHand(4,GetDetail)">查看月结详情</span>
</span> --> </span> -->
...@@ -2083,6 +2089,9 @@ ...@@ -2083,6 +2089,9 @@
<!--供应商信息--> <!--供应商信息-->
<ClientBankAccount v-if="isClientBankAccount" <ClientBankAccount v-if="isClientBankAccount"
:clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount> :clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
<!--代收/代付公司-->
<HelpBranch v-if="GetDetail.HelpBranchId>-1"
:helpBranchData="helpBranchData" ></HelpBranch>
</div> </div>
</template> </template>
<script> <script>
...@@ -2109,6 +2118,7 @@ ...@@ -2109,6 +2118,7 @@
import RollCall from './components/RollCall' import RollCall from './components/RollCall'
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue"; import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
import ClientBankAccount from "./components/ClientBankAccount.vue"; import ClientBankAccount from "./components/ClientBankAccount.vue";
import HelpBranch from "./components/HelpBranch.vue";
export default { export default {
data() { data() {
return { return {
...@@ -2292,6 +2302,7 @@ ...@@ -2292,6 +2302,7 @@
InvoiceLoading: false, InvoiceLoading: false,
isClientBankAccount:false, isClientBankAccount:false,
clientBankAccountData:{}, clientBankAccountData:{},
helpBranchData:{},
} }
}, },
components: { components: {
...@@ -2316,9 +2327,37 @@ ...@@ -2316,9 +2327,37 @@
UserCredit, UserCredit,
RollCall, RollCall,
OrderReceivablesAccount, OrderReceivablesAccount,
ClientBankAccount ClientBankAccount,
HelpBranch
}, },
methods: { methods: {
// 单据详情
openDetails(FrID,Type) {
if (Type==1) {
let query = {
NewFinanceId: FrID,
blank: "y",
};
this.$router.push({
path: "/HelpBranch",
query
});
}
else if (Type==2) {
let query = {
id: FrID,
blank: "y",
};
this.$router.push({
path: "/CapitalAllocationDetail",
query
});
}
},
// 发票审核 // 发票审核
AuditInvoice(){ AuditInvoice(){
this.InvoiceLoading = true this.InvoiceLoading = true
...@@ -3686,6 +3725,10 @@ ...@@ -3686,6 +3725,10 @@
AccountTypeStr:data.AccountTypeStr, AccountTypeStr:data.AccountTypeStr,
AccountCreateTime:data.AccountCreateTime AccountCreateTime:data.AccountCreateTime
} }
this.helpBranchData={
Type:data.Type,
HelpBranchName:data.HelpBranchName,
}
this.benMoney = 0 this.benMoney = 0
this.AuditOrRefundMsg.KingdeeInvoice=data.KingdeeInvoice+""; this.AuditOrRefundMsg.KingdeeInvoice=data.KingdeeInvoice+"";
data.DetailList.forEach(x => { data.DetailList.forEach(x => {
......
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ 990f40ef
...@@ -406,6 +406,7 @@ ...@@ -406,6 +406,7 @@
</tr> </tr>
</table> </table>
<div class="clearfix Ca_comLinediv"> <div class="clearfix Ca_comLinediv">
<span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span> <span class="Ca_remarkSpan">{{$t('hotel.hotel_remark')}}：</span>
<div class="Ca_description">{{item.Description}}</div> <div class="Ca_description">{{item.Description}}</div>
...@@ -585,18 +586,24 @@ ...@@ -585,18 +586,24 @@
</p> </p>
</template> </template>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src.subCode"> <img v-for="src in images" :src="src" :key="src.subCode">
</viewer> </viewer>
<div class="_tit w830px" v-if="dataList.IsRelevanceStatus==1" style="padding: 10px;background-color: white; border-top: 1px dashed #BFBFBF;">
<p style="margin-left: 700px;font-size:12px;color:#000;cursor:pointer;text-decoration:underline;" @click="openDetails(dataList.FrID)">查看代收/代付详情</p>
</div>
<div class="_tit _tit2 w830px"> <div class="_tit _tit2 w830px">
<p> <p>
<span class="_text">{{$t('fnc.shliucheng')}}</span> <span class="_text">{{$t('fnc.shliucheng')}}</span>
<span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span> <span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span> <span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
</p> </p>
<div v-show="tableShow"> <div v-show="tableShow">
<div class="w600px"> <div class="w600px">
<my-FlowChartModule :data="AuditListData"></my-FlowChartModule> <my-FlowChartModule :data="AuditListData"></my-FlowChartModule>
...@@ -824,6 +831,19 @@ export default { ...@@ -824,6 +831,19 @@ export default {
} }
}, },
methods:{ methods:{
// 单据详情
openDetails(FrID) {
let query = {
NewFinanceId: FrID,
blank: "y",
};
this.$router.push({
path: "/HelpBranch",
query
});
},
goPrintPageNew(type,id,Merge,OrderSource){ goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){ if(type===1){
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 990f40ef
...@@ -788,8 +788,17 @@ ...@@ -788,8 +788,17 @@
:remote-method="GetClientAccountListByKeyWord" :remote-method="GetClientAccountListByKeyWord"
> >
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option> <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in ClientAccountList'
</el-option> :label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
:value='item.ID'
:key='item.ID'>
<div>
<span>{{`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.Status==1">冻结</el-tag>
</span>
</div>
</el-option>
</el-select> </el-select>
<!-- <el-select filterable v-model='msg.ClientID' class="w150"> <!-- <el-select filterable v-model='msg.ClientID' class="w150">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option> <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
...@@ -2444,6 +2453,7 @@ ...@@ -2444,6 +2453,7 @@
Type: this.msg.ClientType, Type: this.msg.ClientType,
ObjID: 0, ObjID: 0,
CardNum: "", CardNum: "",
IsAll:true,
KeyWord:query, KeyWord:query,
}; };
this.apipost( this.apipost(
...@@ -2452,16 +2462,16 @@ ...@@ -2452,16 +2462,16 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
let ClientAccountList = []; // let ClientAccountList = [];
data.forEach(x => { // data.forEach(x => {
let obj = { // let obj = {
ID: x.ID, // ID: x.ID,
Name: x.AccountAlias, // Name: x.AccountAlias,
Nom: x.CardNum // Nom: x.CardNum
}; // };
ClientAccountList.push(obj); // ClientAccountList.push(obj);
}); // });
this.ClientAccountList = ClientAccountList; this.ClientAccountList = data;
} }
}, },
err => {} err => {}
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 990f40ef
...@@ -899,6 +899,9 @@ ...@@ -899,6 +899,9 @@
<span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;"> <span v-if="GetDetail.OtherType==71 && GetDetail.DetailList[0].Remark.indexOf('未体现的返佣')==-1" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="goHand(3,GetDetail)">查看手配详情</span> <span style="text-decoration: underline;" @click="goHand(3,GetDetail)">查看手配详情</span>
</span> </span>
<span v-if="GetDetail.NewFinanceId>0 " style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="openDetails(GetDetail.NewFinanceId)">查看往来结算详情</span>
</span>
<!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;"> <!-- <span v-if="GetDetail.OtherType==75" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span style="text-decoration: underline;" @click="goHand(4,GetDetail)">查看月结详情</span> <span style="text-decoration: underline;" @click="goHand(4,GetDetail)">查看月结详情</span>
</span> --> </span> -->
...@@ -1538,6 +1541,9 @@ ...@@ -1538,6 +1541,9 @@
<!--供应商信息--> <!--供应商信息-->
<ClientBankAccount v-if="isClientBankAccount" <ClientBankAccount v-if="isClientBankAccount"
:clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount> :clientBankAccountData="clientBankAccountData" @ClosePopup="isClientBankAccount=false"></ClientBankAccount>
<!--代收/代付公司-->
<HelpBranch v-if="GetDetail.HelpBranchId>-1"
:helpBranchData="helpBranchData" ></HelpBranch>
</div> </div>
</template> </template>
<script> <script>
...@@ -1567,6 +1573,7 @@ ...@@ -1567,6 +1573,7 @@
import RollCall from './components/RollCall'; import RollCall from './components/RollCall';
import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue"; import OrderReceivablesAccount from "./components/OrderReceivablesAccount.vue";
import ClientBankAccount from "./components/ClientBankAccount.vue"; import ClientBankAccount from "./components/ClientBankAccount.vue";
import HelpBranch from "./components/HelpBranch.vue";
export default { export default {
data() { data() {
return { return {
...@@ -1651,6 +1658,7 @@ ...@@ -1651,6 +1658,7 @@
huijiShow: false, huijiShow: false,
clientData: {}, clientData: {},
clientBankAccountData:{}, clientBankAccountData:{},
helpBranchData:{},
isReceivablesAccount: false, isReceivablesAccount: false,
isClientBankAccount:false, isClientBankAccount:false,
ActionMenuCode: '' ActionMenuCode: ''
...@@ -1681,7 +1689,8 @@ ...@@ -1681,7 +1689,8 @@
UserCredit, UserCredit,
RollCall, RollCall,
OrderReceivablesAccount, OrderReceivablesAccount,
ClientBankAccount ClientBankAccount,
HelpBranch
}, },
created() { created() {
// // crm自动登陆传过来的参数 // // crm自动登陆传过来的参数
...@@ -1705,6 +1714,20 @@ ...@@ -1705,6 +1714,20 @@
} }
}, },
methods: { methods: {
// 单据详情
openDetails(FrID) {
let query = {
id: FrID,
blank: "y",
};
this.$router.push({
path: "/CapitalAllocationDetail",
query
});
},
// 获取订单客户收款账号 // 获取订单客户收款账号
getReceivablesAccount(OrderID){ getReceivablesAccount(OrderID){
this.apipost('Financial_post_GetCanActivityContractInfo', { this.apipost('Financial_post_GetCanActivityContractInfo', {
...@@ -2646,7 +2669,10 @@ ...@@ -2646,7 +2669,10 @@
AccountTypeStr:data.AccountTypeStr, AccountTypeStr:data.AccountTypeStr,
AccountCreateTime:data.AccountCreateTime AccountCreateTime:data.AccountCreateTime
} }
this.helpBranchData={
Type:data.Type,
HelpBranchName:data.HelpBranchName,
}
//2023-11-23 add by:W //2023-11-23 add by:W
if(data.InvoiceVoucherInfo){ if(data.InvoiceVoucherInfo){
this.InvoiceVoucherList=data.InvoiceVoucherInfo; this.InvoiceVoucherList=data.InvoiceVoucherInfo;
......
src/components/FinancialModule/HelpBranch/index.vue 0 → 100644
View file @ 990f40ef
This diff is collapsed.
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ 990f40ef
...@@ -84,67 +84,30 @@ ...@@ -84,67 +84,30 @@
</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">
<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="4">
<el-form-item label="收付款账户：">
<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-form-item>
</el-col> -->
<!--
<el-col :span="4">
<el-form-item label="客户类型：">
<el-select filterable v-model='msg.ClientType'
@change="financeinfo_post_GetClientAccountList(msg.ClientType)">
<el-option value="0" label="不限"></el-option>
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</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.ClientID' > <el-select
<el-option value="" label="不限"></el-option> v-model="msg.ClientID" class="w150"
<el-option v-for='item in ClientAccountList' filterable
:label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`' remote
:value='item.ID' reserve-keyword
:key='item.ID'> placeholder="请输入关键词"
</el-option> :remote-method="GetClientAccountListByKeyWord"
</el-select> >
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
:value='item.ID'
:key='item.ID'>
<div>
<span>{{`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.Status==1">冻结</el-tag>
</span>
</div>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -622,7 +585,6 @@ export default { ...@@ -622,7 +585,6 @@ export default {
this.DepartIDs = userInfo.RB_Department_Id; this.DepartIDs = userInfo.RB_Department_Id;
this.msg.EmployeeId= userInfo.EmployeeId; this.msg.EmployeeId= userInfo.EmployeeId;
this.msg.FrID = this.$route.query.FrID?this.$route.query.FrID:0 this.msg.FrID = this.$route.query.FrID?this.$route.query.FrID:0
this.financeinfo_post_GetClientAccountList()
this.financeinfo_post_GetList(); this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList(); this.financeinfo_post_GetCostTypeList();
this.FinancialFlowTemplate_post_GetList(); this.FinancialFlowTemplate_post_GetList();
...@@ -818,23 +780,32 @@ export default { ...@@ -818,23 +780,32 @@ export default {
} }
}, err => {}) }, err => {})
}, },
financeinfo_post_GetClientAccountList(t){ // 获取对象类型 GetClientAccountListByKeyWord(query) {
let msg = { if (query !== '') {
// Type:t, // 获取对象类型
// ObjID:0, let msg = {
// CardNum:'' Type: 0,
ID:0, ObjID: 0,
Type:0, CardNum: "",
ObjID:0, IsAll:true,
CardNum:'' KeyWord:query,
} };
this.apipost('financeinfo_post_GetClientAccountList',msg, res => { this.apipost(
if(res.data.resultCode == 1) { "financeinfo_post_GetClientAccountList",
let data = res.data.data; msg,
this.ClientAccountList = data res => {
} if (res.data.resultCode == 1) {
}, err => {}) let data = res.data.data;
this.ClientAccountList = data;
}
},
err => {}
);
}
}, },
getAccountList(i,t){ //收款账户 getAccountList(i,t){ //收款账户
let accountList = []; let accountList = [];
if(t==1){ // 银行 if(t==1){ // 银行
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 990f40ef
...@@ -112,8 +112,20 @@ ...@@ -112,8 +112,20 @@
:remote-method="GetClientAccountListByKeyWord" :remote-method="GetClientAccountListByKeyWord"
> >
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option> <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
:value='item.ID'
:key='item.ID'>
<div>
<span>{{`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.Status==1">冻结</el-tag>
</span>
</div>
</el-option>
<!-- <el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for='item in ClientAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option> </el-option> -->
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1042,6 +1054,7 @@ ...@@ -1042,6 +1054,7 @@
Type: this.msg.ClientType, Type: this.msg.ClientType,
ObjID: 0, ObjID: 0,
CardNum: "", CardNum: "",
IsAll:true,
KeyWord:query, KeyWord:query,
}; };
this.apipost( this.apipost(
...@@ -1050,16 +1063,7 @@ ...@@ -1050,16 +1063,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
let ClientAccountList = []; this.ClientAccountList = data;
data.forEach(x => {
let obj = {
ID: x.ID,
Name: x.AccountAlias,
Nom: x.CardNum
};
ClientAccountList.push(obj);
});
this.ClientAccountList = ClientAccountList;
} }
}, },
err => {} err => {}
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 990f40ef
...@@ -384,7 +384,8 @@ export default { ...@@ -384,7 +384,8 @@ export default {
Description: '', Description: '',
IsHave: 1, IsHave: 1,
emList: [], emList: [],
BankList: [] BankList: [],
FrIDs:''
}, },
queryAccMsg: { queryAccMsg: {
pageIndex: 1, pageIndex: 1,
...@@ -492,7 +493,7 @@ export default { ...@@ -492,7 +493,7 @@ export default {
this.msg.BankList.forEach(x=>{ this.msg.BankList.forEach(x=>{
delete x.shouAccNumList delete x.shouAccNumList
}) })
this.msg.FrIDs=this.$route.query.frIds;
// return; // return;
this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{ this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 990f40ef
...@@ -747,6 +747,7 @@ ...@@ -747,6 +747,7 @@
</el-select> </el-select>
</span> </span>
</p> </p>
<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 v-model='msg.DepositCustomerId' class="w135 _border_b_1" <el-select clearable v-model='msg.DepositCustomerId' class="w135 _border_b_1"
@change="getSigningCustomerId(2)" :disabled="isDepositCustomer"> @change="getSigningCustomerId(2)" :disabled="isDepositCustomer">
...@@ -781,6 +782,24 @@ ...@@ -781,6 +782,24 @@
</el-switch> </el-switch>
</el-tooltip> </el-tooltip>
</div> </div>
<template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
<div>
<p>
{{this.$route.query.Type==1?'帮代收':'帮代付'}}公司：
<span>
<el-select filterable v-model='msg.HelpBranchId' class="w120 _border_b_1">
<el-option label='请选择' :value='-1' :key='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
:disabled="item.Id===msg.RB_Branch_Id" >
</el-option>
</el-select>
</span>
<span style="margin-left: 20px;color: red;">注：只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，如是本公司款则忽略此项</span>
</p>
</div>
</template>
<template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)"> <template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)">
<div> <div>
<p> <p>
...@@ -1027,6 +1046,7 @@ ...@@ -1027,6 +1046,7 @@
Description: '132356', Description: '132356',
detailList: [], detailList: [],
RB_Branch_Id: '', RB_Branch_Id: '',
HelpBranchId:-1,
RB_Depart_Id: '', RB_Depart_Id: '',
Status: 1, Status: 1,
URL: this.$route.query.path, URL: this.$route.query.path,
...@@ -1854,7 +1874,27 @@ ...@@ -1854,7 +1874,27 @@
that.loading = true; that.loading = true;
that.FinancialPostSet() that.FinancialPostSet()
}).catch(() => {}) }).catch(() => {})
}else{ }
else if(this.msg.HelpBranchId>-1){
let that = this
let brandName='确认是帮';
this.companyList.forEach(item => {
if(item.Id==this.msg.HelpBranchId){
brandName+=item.BName;
}
});
brandName+= (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请正确选择，避免驳回';
this.$confirm(brandName, this.$t('tips.tips'), {
confirmButtonText: '确认提交',
cancelButtonText: '取消提交',
type: 'warning'
}).then(() => {
that.FinancialPostSet()
}).catch(() => {
})
}
else{
that.loading = true; that.loading = true;
that.FinancialPostSet() that.FinancialPostSet()
} }
...@@ -2313,11 +2353,23 @@ ...@@ -2313,11 +2353,23 @@
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
} else { } else {
this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
if ((this.$route.query.id == 245 ||
this.$route.query.id == 246 ||
this.$route.query.id == 247 ||
this.$route.query.id == 248 ||
this.$route.query.id == 267)&&(!this.BillSonName.includes('分摊')&&!this.BillSonName.includes('预付'))) {
this.msg.HelpBranchId=1218;
} else{
this.msg.HelpBranchId=-1;
}
} }
} else { } else {
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 ? this.getLocalStorage().RB_Branch_id : this.msg this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 ? this.getLocalStorage().RB_Branch_id : this.msg
.RB_Branch_Id; .RB_Branch_Id;
} }
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) { if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0]; this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if (this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && } else if (this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
...@@ -2767,6 +2819,8 @@ ...@@ -2767,6 +2819,8 @@
} }
} }
if (this.orderObj && this.orderObj.OtherType) { if (this.orderObj && this.orderObj.OtherType) {
this.ZhuiJiaTK = true this.ZhuiJiaTK = true
} }
...@@ -2815,7 +2869,14 @@ ...@@ -2815,7 +2869,14 @@
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.emplyeeName = userInfo.emName; this.emplyeeName = userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id; this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
if (this.$route.query.id == 245 ||
this.$route.query.id == 246 ||
this.$route.query.id == 247 ||
this.$route.query.id == 248 ||
this.$route.query.id == 267) {
this.msg.HelpBranchId=1218;
}
if (this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj if (this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj
.RB_Branch_Id != undefined) { .RB_Branch_Id != undefined) {
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id; this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 990f40ef
...@@ -599,7 +599,8 @@ ...@@ -599,7 +599,8 @@
:key='item.DepartmentID'> :key='item.DepartmentID'>
</el-option> </el-option>
</el-select> </el-select>
</span></p> </span> </p>
<!-- msg.TemplateId==27&&msg.CourseId&&orderObj&&orderObj.OrderID&&orderObj.OrderSource==8 --> <!-- msg.TemplateId==27&&msg.CourseId&&orderObj&&orderObj.OrderID&&orderObj.OrderSource==8 -->
<template v-if="isReceivablesAccount"> <template v-if="isReceivablesAccount">
<!-- <!--
...@@ -643,6 +644,7 @@ ...@@ -643,6 +644,7 @@
</span> </span>
</p> </p>
</template> </template>
<template v-if="(orderObj&&!orderObj.isPrestore)||msg.SigningCustomerId||msg.DepositCustomerId||RB_Branch_Id==1218"> <template v-if="(orderObj&&!orderObj.isPrestore)||msg.SigningCustomerId||msg.DepositCustomerId||RB_Branch_Id==1218">
<template v-if="!msg.DepositCustomerId||RB_Branch_Id==1218"> <template v-if="!msg.DepositCustomerId||RB_Branch_Id==1218">
<p v-if="CustomerIdList&&CustomerIdList.length" style="margin-left: 15px;">签约客户：<span> <p v-if="CustomerIdList&&CustomerIdList.length" style="margin-left: 15px;">签约客户：<span>
...@@ -669,6 +671,23 @@ ...@@ -669,6 +671,23 @@
</template> </template>
</div> </div>
<template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
<div>
<p>
{{this.$route.query.Type==1?'帮代收':'帮代付'}}公司：
<span>
<el-select filterable v-model='msg.HelpBranchId' class="w120 _border_b_1">
<el-option label='请选择' :value='-1' :key='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
:disabled="item.Id===msg.RB_Branch_Id">
</el-option>
</el-select>
</span>
<span style="margin-left: 20px;color: red;">注：只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，如是本公司款则忽略此项</span>
</p>
</div>
</template>
<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>
...@@ -824,6 +843,7 @@ ...@@ -824,6 +843,7 @@
detailList: [], detailList: [],
RB_Depart_Id: '', RB_Depart_Id: '',
RB_Branch_Id: '', RB_Branch_Id: '',
HelpBranchId:-1,
Status: 1, Status: 1,
OriginalFee: 0, OriginalFee: 0,
emList: [], emList: [],
...@@ -1602,7 +1622,27 @@ ...@@ -1602,7 +1622,27 @@
}).catch(() => { }).catch(() => {
}) })
}else{ }
else if(this.msg.HelpBranchId>-1){
let that = this
let brandName='确认是帮';
this.companyList.forEach(item => {
if(item.Id==this.msg.HelpBranchId){
brandName+=item.BName;
}
});
brandName+= (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请正确选择，避免驳回';
this.$confirm(brandName, this.$t('tips.tips'), {
confirmButtonText: '确认提交',
cancelButtonText: '取消提交',
type: 'warning'
}).then(() => {
that.Financial_post_Set()
}).catch(() => {
})
}
else{
this.Financial_post_Set() this.Financial_post_Set()
} }
...@@ -1950,8 +1990,9 @@ ...@@ -1950,8 +1990,9 @@
if(!this.$route.query.edit){ if(!this.$route.query.edit){
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 || this.msg.RB_Branch_Id == ParentCompanyId ? this
.getLocalStorage().RB_Branch_id : this.msg.RB_Branch_Id; .getLocalStorage().RB_Branch_id : this.msg.RB_Branch_Id;
} }
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) { if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0]; this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if (this.$route.query.companyID) { } else if (this.$route.query.companyID) {
......
src/components/FinancialModule/components/HelpBranch.vue 0 → 100644
View file @ 990f40ef
<style scoped>
.OrderReceivablesAccount-form{
width: 330px;
position: fixed;
z-index: 2;
right: 16px;
top: 100px;
background: #fff;
padding: 14px 26px 14px 13px;
border-radius: 8px;
}
.OrderReceivablesAccount-title{
font-size: 18px;
font-weight: bold;
padding: 0 0 10px 0;
}
.OrderReceivablesAccount-center>div{
/* display: flex;
flex-wrap: nowrap; */
padding: 0 0 10px 0;
font-size: 14px;
}
.OrderReceivablesAccount-center>div:last-child{
padding: 0;
}
.OrderReceivablesAccount-center>div>span{
/* color: #949695; */
width: 70px;
display: inline-block;
margin-right: 10px;
text-align: right;
/* flex-shrink: 0; */
}
.OrderReceivablesAccount-contract{
display: flex;
flex-wrap: wrap;
}
.OrderReceivablesAccount-imgBox{
width: 50px;
height: 50px;
margin-right: 5px;
margin-bottom: 3px;
overflow: hidden;
position: relative;
border: 1px dashed #d1d1d1;
border-radius: 6px;
}
.imgBox-imgs img{
width: 100%;
height: 100%;
display: block;
}
.ClosePopup{
position: fixed;
right: 30px;
top: 110px;
z-index: 3;
font-size: 20px;
cursor: pointer;
}
.OrderReceivablesAccount-imgBox{
cursor: pointer;
}
.OrderReceivablesAccount-imgBox ._see_img{
opacity: 0;
}
.OrderReceivablesAccount-imgBox ._see_img {
position: absolute;
top: 0;
width: 50px;
height: 50px;
padding-top: 0;
line-height: 34px;
text-align: center;
background-color: rgba(2, 2, 2, 0.3);
display: inherit;
opacity: 0;
transition: all linear .5s
}
.OrderReceivablesAccount-imgBox:hover ._see_img {
opacity: 1;
}
.OrderReceivablesAccount-imgBox ._see_img .icon-sousuo{
margin-top: 8px;
}
.OrderReceivablesAccount-imgBox ._see_img i.iconfont {
display: inline-block;
width: 32px;
height: 32px;
border-radius: 50%;
color: #FFFFFF !important;
background-color: rgba(255, 255, 255, 0.5);
}
</style>
<template>
<div class="OrderReceivablesAccount-form" v-if="helpBranchData">
<!-- <div class="OrderReceivablesAccount-title">帮{{helpBranchData.Type==1?'代收':'代付'}}公司</div> -->
<div class="OrderReceivablesAccount-center">
<div v-if="helpBranchData.Type==2"><span>代&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;付：</span><span style="color:red;width:auto;">由{{helpBranchData.HelpBranchName}}{{helpBranchData.Type==1?'代收':'代付'}}</span> </div>
<div v-else-if="helpBranchData.Type==1"><span>代&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;收：</span><span style="color:red;width:auto;">帮{{helpBranchData.HelpBranchName}}{{helpBranchData.Type==1?'代收':'代付'}} </span></div>
</div>
</div>
</template>
<script>
export default {
props:['helpBranchData'],
data() {
return {
}
},
created() {
},
methods: {
},
mounted() {
}
}
</script>
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