Skip to content

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

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

parents 4af826e3 d2631e63
Hide whitespace changes
Inline Side-by-side
Showing with 613 additions and 5 deletions
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ 484b8668
......@@ -479,6 +479,36 @@
</table>
</div>
</div>
<div v-if="OtherType==91">
<div class="_tit">
<span class="_text">预存预付对象</span>
<div>
<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>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th>{{$t('objFill.duixiangmc')}}</th>
<th>{{$t('system.table_uniqueMark')}}</th>
<th width="160">{{$t('hotel.hotel_remark')}}</th>
<th>{{$t('fnc.w_shou')}}</th>
<th>{{$t('fnc.w_zhi')}}</th>
<th>{{$t('fnc.yueacc')}}</th>
</tr>
<tr class="_color_b" v-for="(item,index) in advanceObjList" :key="index">
<td>{{item.Name}}</td>
<th>{{item.DutyNo}}</th>
<td>{{item.Remark}}</td>
<!-- <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td> -->
<th>{{item.Income}}</th>
<td>{{item.Refund}}</td>
<td>{{item.Surplus}}</td>
</tr>
</table>
</div>
</div>
</div>
</template>
......@@ -515,6 +545,7 @@ export default {
JapanCarModel: {},
saleClaimList: [],
IsFinanceORAdmin:false,
advanceObjList:[],
}
},watch:{
'GetDetail': {
......@@ -609,6 +640,8 @@ export default {
this.getSaleClaimList();
}else if(this.details.SpecialType && this.details.SpecialType==17){
this.getOPFinanceFeeList(22);
}else if(this.OtherType==91){
this.getAdvanceObjList();
}
},
goTravelControlList(id){
......@@ -727,6 +760,23 @@ export default {
}
}, err => {})
},
getAdvanceObjList(){
this.loading = true
let msg={
pageIndex:1,
pageSize:12,
Id:this.ReFinanceId,
};
this.apipost('Financial_post_GetAdvancePaymentPageList', msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.advanceObjList=res.data.data.pageData;
}
else{
this.Error(res.data.message)
}
}, err => {})
},
getSaleClaimList(){
this.loading = true
let msg={
......
src/components/FinancialModule/PrestorageManagement/TempHoldPay.vue 0 → 100644
View file @ 484b8668
<style scoped>
/deep/.el-table th.el-table__cell{
background-color: #E6E6E6;
}
</style>
<template >
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex()">
<div class="query-box" style="margin-bottom: 0px;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<el-col :span="4">
<el-form-item label="关键字">
<el-input placeholder="请输入关键字查询" class="" v-model="msg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="">
<el-checkbox v-model="msg.IsBalance" :true-label="1" :false-label="0">只看有余额</el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
<li class="hight_query">
<button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
</li>
</ul>
</div>
<div style="color: red;font-size: 13px;text-align: right;padding: 10px 0;">注* 余额为正数表示待退回，余额为负数表示要待收回</div>
<div class="_fnDm_content" v-loading='loading'>
<el-table
ref="multipleTable"
:data="DataList"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column prop="Name" label="名称"></el-table-column>
<el-table-column prop="DutyNo" label="唯一标识"></el-table-column>
<el-table-column prop="Remark" label="备注"></el-table-column>
<el-table-column prop="StartMoney" label="期初"></el-table-column>
<el-table-column prop="Income" label="收">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.Income }}</span>
</template>
</el-table-column>
<el-table-column prop="Refund" label="支">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.Refund }}</span>
</template>
</el-table-column>
<el-table-column prop="Surplus" label="余额"></el-table-column>
<el-table-column :label="$t('system.table_operation')">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="downloadDetail(scope.row)">{{$t('objFill.xiazamx')}}</span>
</template>
</el-table-column>
</el-table>
<div style="padding-bottom:15px">
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</div>
<detailList v-if="showdetail" :ClientId="detailObj&&detailObj.Id" @cancel="showdetail=false"></detailList>
</div>
</template>
<script>
import Vue from 'vue'
import detailList from "./components/AdvanceDetailList.vue";
export default {
components: {
detailList
},
data(){
return{
detailObj: null,
showdetail: false,
DataList:[],
msg:{
pageIndex:1,
pageSize: 10,
Id:0,
Name:'',
IsBalance:1,
EmployeeId:'',
},
loading: false,
total: 0,
productionDate:[],
branchList:[]
}
},
created(){
if(this.$route.query.Id){
this.msg.Id = this.$route.query.Id
}
},
mounted(){
let userInfo=this.getLocalStorage();
this.msg.EmployeeId= userInfo.EmployeeId;
this.getPageList();
},
methods:{
seeDeta(row){
this.detailObj = row
this.showdetail = true
},
getPageList(){ // 获取列表数据
this.loading= true;
this.apipost('Financial_post_GetAdvancePaymentPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
this.total = res.data.data.count;
if(this.total==0){
this.DataList=[];
}else{
this.DataList = data;
}
this.loading=false;
}else{
this.loading= false;
this.$message.error(res.data.message);
}
},err=>{})
},
method5() {
let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
var fileName = `预收预付${time}.xls`;
this.GetLocalFile("Financial_post_DownLoadAdvancePayment", this.msg,fileName);
},
downloadDetail(item) {
let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
var fileName = `预收预付明细${time}.xls`;
this.GetLocalFile("Financial_post_DownLoadAdvancePaymentLog", {ReFinanceId:item.Id,EmployeeId:this.msg.EmployeeId},fileName);
} ,
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getPageList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.getPageList();
},
}
}
</script>
src/components/FinancialModule/PrestorageManagement/components/AdvanceDetailList.vue 0 → 100644
View file @ 484b8668
<style scoped>
</style>
<template >
<el-dialog :title="$t('objFill.shiyongmx')" :visible.sync="showDetail" center @close="cancelBtn">
<div class="page_fnDm page_RecPayQuery">
<div class="_fnDm_content" v-loading='loading'>
<el-table
ref="multipleTable"
:data="DataList"
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column prop="CreateDate" :label="$t('pub.date')" min-width="120"></el-table-column>
<el-table-column
prop=""
:label="$t('system.query_type')">
<template slot-scope="scope">
{{ scope.row.Type}}
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.jinchujine')">
<template slot-scope="scope">
<span :style="{'color': scope.row.Type==2?'#E95252':''}">
{{ scope.row.Type==1?'+':'-'}}{{ scope.row.Money}}
</span>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.guanliandanhao')">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.dabhaozhuantai')">
<template slot-scope="scope">
<span style="font-size: 12px;">
<i v-if="scope.row.Status===1" class="iconfont icon-daiqueren" style="color: #4BCA81;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===4" class="iconfont icon-yiquxiao" style="color: #4BCA81">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===2" class="iconfont icon-yiqueren" style="color: #959595;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===3" class="iconfont icon-shenhebohui" style="color: #E95252">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===0" class="iconfont icon-zancun" style="color: #FF9C01">{{scope.row.StatusName}}</i>
</span>
</template>
</el-table-column>
<el-table-column prop="CreateName" :label="$t('admin.admin_czPerson')" min-width="130"></el-table-column>
</el-table>
<div style="padding-bottom:15px">
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="cancelBtn">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="cancelBtn">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</template>
<script>
import Vue from 'vue'
export default {
props:['ClientId'],
data(){
return{
showDetail: true,
DataList:[],
msg:{
pageIndex:1,
pageSize: 10,
OtherType:91,
ReFinanceId:'',
},
loading: false,
total: 0,
productionDate:[]
}
},
created(){
},components: {
},
mounted(){
this.msg.ReFinanceId = this.ClientId
this.getPageList();
},
methods:{
// 单据详情
openDetails(FrID) {
this.cancelBtn()
let query = {
id: FrID,
blank: "y",
};
this.$router.push({
path: "/FinancialDocumentsDetail",
query
});
},
cancelBtn(){
this.$emit('cancel')
},
getPageList(){ // 获取列表数据
this.loading= true;
this.apipost('Financial_post_GetAdvancePaymentLogPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
this.total = res.data.data.count;
if(this.total==0){
this.DataList=[];
}else{
this.DataList = data;
}
this.loading=false;
}else{
this.loading= false;
this.$message.error(res.data.message);
}
},err=>{})
},
timeAdd(){ // 日期格式
if(!this.productionDate){
this.msg.StartTime = '';
this.msg.EndTime = '';
return
}
this.msg.StartTime = this.productionDate[0];
this.msg.EndTime = this.productionDate[1];
},
method5: function() {
let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
var fileName = `${this.$t('objFill.monthlystatementofcosts')}${time}.xls`;
this.GetLocalFile("Financial_get_GetCostMonthALLExport", this.msg,fileName);
} ,
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getPageList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.getPageList();
},
}
}
</script>
src/components/FinancialModule/PrestorageManagement/prestoreList.vue
View file @ 484b8668
......@@ -186,7 +186,7 @@ export default {
},
downloadDetail(item) {
let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
var fileName = `${this.$t('objFill.kehuycmx')}${ttime}.xls`;
var fileName = `${this.$t('objFill.kehuycmx')}${time}.xls`;
this.GetLocalFile("Financial_post_DownLoadFinanceDepositLog", {DepositCustomerId:item.CustomerId,EmployeeId:this.msg.EmployeeId},fileName);
} ,
handleCurrentChange(val) { //翻页
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 484b8668
......@@ -866,6 +866,7 @@
</div>
<!-- ld 2025-07-07 这个
<template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
<div>
<p>
......@@ -882,7 +883,7 @@
</p>
</div>
</template>
</template> -->
<template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)">
<div>
<p>
......@@ -966,6 +967,60 @@
<td height="26px">{{DepositCustomer.depositMoney?DepositCustomer.depositMoney:'-'}}</td>
</tr>
</table>
<!-- 预收预付管理 -->
<div v-if="IsAdvance==1||IsAdvance==2">
<p v-if="IsAdvanceAdd==false">
<span style="color:red">
{{(IsAdvance==1?"保证金对象":IsAdvance==2?"借贷对象":"")}}
<el-tooltip class="item" effect="dark" content="默认显示20个对象，请输入关键词(姓名/公司名称/税号等)查询更多对象" placement="top-start">
<i class="el-tooltip el-icon-info"></i>：
</el-tooltip>
</span>
<span>
<el-select filterable v-model='AdvanceObjId' class="w135 _border_b_1" placeholder="请输入关键词"
remote reserve-keyword :remote-method="getAdvanceList"
>
<el-option v-for='item in AdvanceObjList' :label="`${item.Name}/${item.DutyNo}`" :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
<span style="margin-left:15px">
<el-tooltip class="item" effect="dark" content="关键字未查询到相关对象、请新增对象" placement="top-start">
<el-button type="primary" icon="el-icon-plus" circle size="mini" @click="IsAdvanceAdd=true"></el-button>
</el-tooltip>
</span>
</p>
<p v-if="IsAdvanceAdd">
<span style="color:red">
{{(IsAdvance==1?"保证金对象":IsAdvance==2?"借贷对象":"")}}
<el-tooltip class="item" effect="dark" content="个人用户请填入姓名，供应商或平台等请填公司全称" placement="top-start">
<i class="el-tooltip el-icon-info"></i>：
</el-tooltip>
</span>
<el-input class="w120 _border_b_1" v-model="AdvanceObjMsg.Name" placeholder="请输入对象全称"></el-input>
</p>
<p v-if="IsAdvanceAdd">
<span style="color:red">
唯一标识
<el-tooltip class="item" effect="dark" content="个人用户请填入身份证，供应商或平台等请填入税号，财务部将审核唯一标识不合符标准的驳回处理" placement="top-start">
<i class="el-tooltip el-icon-info"></i>：
</el-tooltip>
</span>
<el-input class="w120 _border_b_1" v-model="AdvanceObjMsg.DutyNo" placeholder="请输入税号/身份证"></el-input>
</p>
<p v-if="IsAdvanceAdd">
<span style="color:red">备注：</span>
<el-input class="w120 _border_b_1" v-model="AdvanceObjMsg.Remark" placeholder="请输入描述"></el-input>
</p>
<span v-if="IsAdvanceAdd" style="margin-left:15px">
<el-tooltip class="item" effect="dark" content="保存对象" placement="top-start">
<el-button type="primary" icon="el-icon-check" circle size="mini" @click="SaveAdvance()"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top-start">
<el-button type="primary" icon="el-icon-close" circle size="mini" @click="IsAdvanceAdd=false"></el-button>
</el-tooltip>
</span>
</div>
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
......@@ -1287,6 +1342,16 @@
isHandFee: false,
is_HandFee: true, //是否开启
HandlingChargeType: 0, //月结制单 1转账手续费 2转账手续费差额
IsAdvance:0,// 预存预付对象标识 1保证金 2借贷
IsAdvanceAdd:false,
AdvanceObjId:'',
AdvanceObjList:[],// 预存预付对象列表
AdvanceObjMsg:{
Id:0,
Name:'',
DutyNo:'',
Remark:''
}
}
},
methods: {
......@@ -1381,6 +1446,19 @@
},
// 获取当前手配费选项
chooseHandFee() {
//验证是否有暂存暂付款
if(this.msg.OrderSource!=8 &&this.msg.OrderSource!=10 && this.msg.OrderID<=0 && this.msg.OtherType !=55&& this.msg.OtherType !=61&& this.msg.OtherType !=66
&& this.msg.OtherType !=67&& this.msg.OtherType !=80&& this.msg.OtherType !=83 && !this.$route.query.tradeObj&& !this.$route.query.orderObj&& !this.$route.query.crmOrderObj){
this.IsAdvance=0;
if(this.msg.OtherType==91){this.msg.OtherType=0;this.msg.ReFinanceId = 0;this.msg.ReFinanceId2 = 0;}
this.msg.detailList.forEach((x, index) => {
if(x.IsAdvance==1||x.IsAdvance==2){
this.IsAdvance= x.IsAdvance;
}
})
if(this.AdvanceObjList.length==0 && (this.IsAdvance==1||this.IsAdvance==2)){this.getAdvanceToIdList(0,true);}
}
let handfreeCount = 0;
let companyID = this.$route.query.companyID;
if (companyID == 1220) {
......@@ -1984,6 +2062,17 @@
this.msg.ReTCID = this.czmsg.ReTCID;
}
//预存预付对象
if(this.IsAdvance==1||this.IsAdvance==2){
this.msg.OtherType=91;
this.msg.ReFinanceId = this.AdvanceObjId;
this.msg.ReFinanceId2 = this.IsAdvance;
if(this.AdvanceObjId<=0){
this.Error("请选择"+(this.IsAdvance==1?"保证金对象":"借贷对象"));
return;
}
}
// 是否是日本客户
let that = this
let ClientAccountObj = this.ClientAccountList.find(x => {
......@@ -2258,12 +2347,15 @@
if (x.ID == i) {
if (t >= 0) {
this.msg.detailList[t].CostTypeName = x.Name;
this.msg.detailList[t].IsAdvance = x.IsA;
console.log('ld1:'+x.IsA);
if (x.ID === 56) {
this.msg.detailList[t].Remark = this.orderObj.TCNUMS ?
`${this.$t('objFill.dijiefeilqzdsc')}：${this.orderObj.TCNUMS}` : '';
}
} else {
this.detailList.CostTypeName = x.Name;
this.detailList.IsAdvance = x.IsA;
if (x.ID === 56) {
this.detailList.Remark = this.orderObj.TCNUMS ?
`${this.$t('objFill.dijiefeilqzdsc')}：${this.orderObj.TCNUMS}` : '';
......@@ -2656,6 +2748,12 @@
}
this.GetDetail = data;
this.GetHandFeeList() //获取手配费功能权限配置
//预收预付对象处理
if(data.OtherType==91){
this.IsAdvance=data.ReFinanceId2;
this.AdvanceObjId = data.ReFinanceId;
this.getAdvanceToIdList(data.ReFinanceId);
}
if (this.orderObj != null && this.orderObj.OrderSource === 10) {
} else {
......@@ -3055,6 +3153,36 @@
}
}, err => {})
},
SaveAdvance(){
this.apipost('Financial_post_SetAdvancePaymentInfo', this.AdvanceObjMsg, res => {
if (res.data.resultCode == 1) {
this.AdvanceObjId = res.data.data;
this.getAdvanceToIdList(this.AdvanceObjId);
this.IsAdvanceAdd=false;
this.AdvanceObjMsg.Name='';
this.AdvanceObjMsg.DutyNo='';
this.AdvanceObjMsg.Remark='';
}
}, err => {})
},
getAdvanceList(query){
if (query !== ''){
this.apipost('Financial_post_GetAdvancePaymentPageList', {pageIndex:1,pageSize:20,Name:query}, res => {
if (res.data.resultCode == 1) {
this.AdvanceObjList = res.data.data.pageData;
}
}, err => {})
}
},
getAdvanceToIdList(id,isAll){
if (id>0||isAll){
this.apipost('Financial_post_GetAdvancePaymentPageList', {pageIndex:1,pageSize:20,Id:id}, res => {
if (res.data.resultCode == 1) {
this.AdvanceObjList = res.data.data.pageData;
}
}, err => {})
}
}
},
created() {
var that = this;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 484b8668
......@@ -689,7 +689,7 @@
</template>
</div>
<template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
<!-- <template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
<div>
<p>
{{$t('objFill.daishoukuanyuangs')}}：
......@@ -705,7 +705,7 @@
</p>
</div>
</template>
</template> -->
<table v-if="ContractCustomer" class="Receipt_table" border="1" bordercolor="#c94052"
style="border-collapse:collapse;margin-top: 10px;">
<tr>
......@@ -741,6 +741,60 @@
<td height="26px">{{DepositCustomer.depositMoney?DepositCustomer.depositMoney:'-'}}</td>
</tr>
</table>
<!-- 预收预付管理 -->
<div v-if="IsAdvance==1||IsAdvance==2">
<p v-if="IsAdvanceAdd==false">
<span style="color:red">
{{(IsAdvance==1?"保证金对象":IsAdvance==2?"借贷对象":"")}}
<el-tooltip class="item" effect="dark" content="默认显示20个对象，请输入关键词(姓名/公司名称/税号等)查询更多对象" placement="top-start">
<i class="el-tooltip el-icon-info"></i>：
</el-tooltip>
</span>
<span>
<el-select filterable v-model='AdvanceObjId' class="w135 _border_b_1" placeholder="请输入关键词"
remote reserve-keyword :remote-method="getAdvanceList"
>
<el-option v-for='item in AdvanceObjList' :label="`${item.Name}/${item.DutyNo}`" :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
<span style="margin-left:15px">
<el-tooltip class="item" effect="dark" content="关键字未查询到相关对象、请新增对象" placement="top-start">
<el-button type="primary" icon="el-icon-plus" circle size="mini" @click="IsAdvanceAdd=true"></el-button>
</el-tooltip>
</span>
</p>
<p v-if="IsAdvanceAdd">
<span style="color:red">
{{(IsAdvance==1?"保证金对象":IsAdvance==2?"借贷对象":"")}}
<el-tooltip class="item" effect="dark" content="个人用户请填入姓名，供应商或平台等请填公司全称" placement="top-start">
<i class="el-tooltip el-icon-info"></i>：
</el-tooltip>
</span>
<el-input class="w120 _border_b_1" v-model="AdvanceObjMsg.Name" placeholder="请输入对象全称"></el-input>
</p>
<p v-if="IsAdvanceAdd">
<span style="color:red">
唯一标识
<el-tooltip class="item" effect="dark" content="个人用户请填入身份证，供应商或平台等请填入税号，财务部将审核唯一标识不合符标准的驳回处理" placement="top-start">
<i class="el-tooltip el-icon-info"></i>：
</el-tooltip>
</span>
<el-input class="w120 _border_b_1" v-model="AdvanceObjMsg.DutyNo" placeholder="请输入税号/身份证"></el-input>
</p>
<p v-if="IsAdvanceAdd">
<span style="color:red">备注：</span>
<el-input class="w120 _border_b_1" v-model="AdvanceObjMsg.Remark" placeholder="请输入描述"></el-input>
</p>
<span v-if="IsAdvanceAdd" style="margin-left:15px">
<el-tooltip class="item" effect="dark" content="保存对象" placement="top-start">
<el-button type="primary" icon="el-icon-check" circle size="mini" @click="SaveAdvance()"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top-start">
<el-button type="primary" icon="el-icon-close" circle size="mini" @click="IsAdvanceAdd=false"></el-button>
</el-tooltip>
</span>
</div>
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
......@@ -1091,7 +1145,17 @@
Type:2,
FinanceId:0
},
multipleSelection:[]
multipleSelection:[],
IsAdvance:0,// 预存预付对象标识 1保证金 2借贷
IsAdvanceAdd:false,
AdvanceObjId:'',
AdvanceObjList:[],// 预存预付对象列表
AdvanceObjMsg:{
Id:0,
Name:'',
DutyNo:'',
Remark:''
}
}
},
methods: {
......@@ -1721,6 +1785,17 @@
this.msg.OrderTradeWay = this.tradeWay;
this.msg.PlatformAccountId = this.platformAccount;
//预存预付对象
if(this.IsAdvance==1||this.IsAdvance==2){
this.msg.OtherType=91;
this.msg.ReFinanceId = this.AdvanceObjId;
this.msg.ReFinanceId2 = this.IsAdvance;
if(this.AdvanceObjId<=0){
this.Error("请选择"+(this.IsAdvance==1?"保证金对象":"借贷对象"));
return;
}
}
if(this.clientData&&this.clientData.State&&this.clientData.State==1
&&(!this.msg.PayReceipt_No||this.msg.PayReceipt_No=='')){
let text = this.$t('objFill.xuanzheptname')
......@@ -1901,6 +1976,18 @@
}
this.countFee();
//验证是否有暂存暂付款
if(this.msg.OrderSource!=8 &&this.msg.OrderSource!=10 && this.msg.OrderID<=0 && this.msg.OtherType !=55&& this.msg.OtherType !=61&& this.msg.OtherType !=66
&& this.msg.OtherType !=67&& this.msg.OtherType !=80&& this.msg.OtherType !=83 && !this.$route.query.tradeObj&& !this.$route.query.orderObj&& !this.$route.query.crmOrderObj){
this.IsAdvance=0;
if(this.msg.OtherType==91){this.msg.OtherType=0;this.msg.ReFinanceId = 0;this.msg.ReFinanceId2 = 0;}
this.msg.detailList.forEach((x, index) => {
if(x.IsAdvance==1||x.IsAdvance==2){
this.IsAdvance= x.IsAdvance;
}
})
if(this.AdvanceObjList.length==0 && (this.IsAdvance==1||this.IsAdvance==2)){this.getAdvanceToIdList(0,true);}
}
},
getcommission() { //计算手续费 满足平台账户 而且是结算方式为百分比 SettlementType=1
let obj = null
......@@ -2045,8 +2132,10 @@
if (x.ID == i) {
if (t >= 0) {
this.msg.detailList[t].CostTypeName = x.Name;
this.msg.detailList[t].IsAdvance = x.IsA;
} else {
this.detailList.CostTypeName = x.Name;
this.detailList.IsAdvance = x.IsA;
}
}
})
......@@ -2169,6 +2258,14 @@
this.msg.OrderID = data.OrderID;
this.msg.OrderSource = 0;
this.msg.TCID = data.TCID;
//预收预付对象处理
if(data.OtherType==91){
this.IsAdvance=data.ReFinanceId2;
this.AdvanceObjId = data.ReFinanceId;
this.getAdvanceToIdList(data.ReFinanceId);
}
if (this.orderObj) {
this.msg.OrderID = this.orderObj.OrderID ? this.orderObj.OrderID : 0;
this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
......@@ -2478,6 +2575,36 @@
},
BankTradeDateChange(){
this.GetBankFlowData(0);
},
SaveAdvance(){
this.apipost('Financial_post_SetAdvancePaymentInfo', this.AdvanceObjMsg, res => {
if (res.data.resultCode == 1) {
this.AdvanceObjId = res.data.data;
this.getAdvanceToIdList(this.AdvanceObjId);
this.IsAdvanceAdd=false;
this.AdvanceObjMsg.Name='';
this.AdvanceObjMsg.DutyNo='';
this.AdvanceObjMsg.Remark='';
}
}, err => {})
},
getAdvanceList(query){
if (query !== ''){
this.apipost('Financial_post_GetAdvancePaymentPageList', {pageIndex:1,pageSize:20,Name:query}, res => {
if (res.data.resultCode == 1) {
this.AdvanceObjList = res.data.data.pageData;
}
}, err => {})
}
},
getAdvanceToIdList(id,isAll){
if (id>0||isAll){
this.apipost('Financial_post_GetAdvancePaymentPageList', {pageIndex:1,pageSize:20,Id:id}, res => {
if (res.data.resultCode == 1) {
this.AdvanceObjList = res.data.data.pageData;
}
}, err => {})
}
}
},
created() {
......
src/router/config.js
View file @ 484b8668
......@@ -3479,6 +3479,14 @@ export default {
title: '财务单据审核'
},
},
{ // 客户预存管理
path: '/TempHoldPay',
name: 'TempHoldPay',
component: resolve => require(['@/components/FinancialModule/PrestorageManagement/TempHoldPay'], resolve),
meta: {
title: '预收预付管理'
},
},
{ // 客户预存管理
path: '/prestoreList',
name: 'prestoreList',
......
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