Skip to content

S
SuperMan
Commit 6a3620d7 authored by liudong1993's avatar liudong1993
Browse files
Options

1 PIC优先付款

parent 50cbcacb
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 3 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 6a3620d7
......@@ -3841,7 +3841,8 @@ else if (Type==2) {
JapanFeeRate: data.JapanFeeRate,
JapanFinanceId: data.JapanFinanceId,
FTravelID: data.FTravelID,
FTracelRemark: data.FTracelRemark
FTracelRemark: data.FTracelRemark,
JapanPayMark : data.JapanPayMark
}
this.helpBranchData={
Type:data.Type,
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 6a3620d7
......@@ -704,6 +704,7 @@
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">{{$t('ios.shenpi')}}</button>
<button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">{{$t('objFill.handdistributionfeeincome')}}</button>
<button class="hollowFixedBtn" @click="ZhiDanChongDi"> {{$t('objFill.precharge')}}</button>
<button v-if="this.userId==2739" class="hollowFixedBtn" @click="openMarkDialog"> PIC优先付款记录</button>
<!-- v-if="F_Advance_Match" -->
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? $t('objFill.disableapproval') : $t('objFill.oneclickapproval')}}</button>
......@@ -1392,7 +1393,7 @@
{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<el-dialog :title="$t('objFill.precharge')" width="860px" :visible.sync="yfcdState" center>
<el-dialog :title="$t('objFill.precharge')" width="960px" :visible.sync="yfcdState" center>
<el-form class="cdForm" label-width="90px">
<el-form-item :label="$t('fnc.danhao')" prop="FrID">
<el-input class="w220" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
......@@ -1554,8 +1555,91 @@
getPageList(),
costmodeHL=false" @cancel="costmodeHL=false"></editExchangeRate>
<el-dialog title="PIC优先付款记录" width="1060px" :visible.sync="MarkState" center>
<el-form class="cdForm" label-width="40px">
<el-form-item :label="$t('fnc.danhao')" prop="FrID">
<el-input class="w320" v-model="MarkFrIds"></el-input>
</el-form-item>
<el-form-item>
<input type="button" :value="$t('pub.searchBtn')" class="hollowFixedBtn" @click="getMarkList">
</el-form-item>
</el-form>
<p style="color: red;text-align: left;padding: 5px;">*多单据请使用英文逗号分隔，如12341,45671</p>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="MarkLoading">
<tr>
<th>单号</th>
<th>公司</th>
<th>关联团队</th>
<th>费用类型</th>
<th>金额</th>
<th width="250">付款对象</th>
<th>制单人</th>
<th>单据状态</th>
</tr>
<tr v-for="(item,index) in MarkList" :key="index">
<td>{{item.FrID}}</td>
<td>{{item.BranchName}}</td>
<td><span v-for="qitem in item.TCIDAndTCNUMList">{{qitem.TCNUM+"("+qitem.TCID+")"}}</span></td>
<td><span v-for="qitem in item.CostTypeList">{{qitem}} &nbsp;</span></td>
<td>{{item.WBMoney+" " + item.CurrencyName}}</td>
<td>{{item.RemitterName}}</td>
<td>{{item.EmName}}{{item.CreateDate}}</td>
<td>{{item.StatusStr}}</td>
</tr>
<tr v-if="MarkTotal">
<td colspan='4'>合计</td>
<td>{{MarkTotal}}</td>
</tr>
<tr v-if="MarkList.length==0">
<td colspan="13">{{$t('system.content_noData')}}</td>
</tr>
</table>
<p style="color: red;text-align: left;padding: 5px;">*请上传凭证</p>
<div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in MarkVorcherInos">
<div v-if="file.Type==3" style="width:30px; float:left;">
<div class="iconfont ">
<el-image
style="height:16px;"
:src="file.Url?file.Url:file.Content"
:preview-src-list="[file.Url?file.Url:file.Content]">
</el-image>
<!-- <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file,index)" style="height:16px;"> -->
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;" @click="deleteMarkUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1" style="width:30px; float:left;">
<div class="iconfont "
:class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;" @click="deleteMarkUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==2" style="width:30px; float:left;">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;" @click="deleteMarkUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload financiaUpload">
<el-upload drag :http-request="uploadFileMarkBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text" >{{$t('tips.dianjishanhcuan')}}</div>
</el-upload>
</div>
<p style="color: red;text-align: left;padding: 5px;">*标记备注（非必填）</p>
<el-input type="textarea" class="w320" v-model="MarkRemark" placeholder="请输入备注"></el-input>
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="MarkState=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="saveMark">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
<!-- 修改汇率
<el-dialog :title="$t('objFill.modifytheexchangerate')" width="400px"
:visible.sync="costmodeHL" center >
......@@ -1802,6 +1886,13 @@
trabeListHL: [], //修改费率下拉数据
isJapanCommission: false,
typeSystem: 0,
MarkState: false,
MarkLoading: false,
MarkList: [],
MarkTotal: '',
MarkFrIds: '',
MarkVorcherInos: [],
MarkRemark: ''
};
},
created() {
......@@ -1957,6 +2048,74 @@
}
// this.saveMsgInvoice.splice(i, 1);
},
uploadFileMarkBtn(file) { //上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t('tips.wjdxbncgsz'))
return
}
// 1 文档 2 数据 3 图片
let typeArr = [{
stringArr: 'GIF|JPG|JPEG|PNG|BMP',
type: 3
},
{
stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
type: 1
},
]
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != '-1') {
fileTypeNumber = x.type;
typeOk = true;
}
})
if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
this.MarkVorcherInos.push({
Content: x.data.FilePath,
ID: 0,
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.$message.success(this.$t('tips.scchenggong'))
}, 1);
},
deleteMarkUploadFile(i) { // 删除上传文件
this.MarkVorcherInos.splice(i, 1);
},
saveMark() {
if (this.MarkList.length<=0){
return this.$message.error("请输入单号并点击查询");
}
if (this.MarkVorcherInos.length<=0){
return this.$message.error("请上传凭证");
}
this.apipost("Financial_post_SetJapanPayMark",{FrIDs:this.MarkFrIds,vorcherInos:this.MarkVorcherInos,Remark:this.MarkRemark},res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.MarkList = [];
this.MarkFrIds = '';
this.MarkVorcherInos = [];
this.MarkRemark='';
this.MarkTotal='';
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
hideFill() {
this.fillShow = false;
},
......@@ -2058,6 +2217,10 @@
this.yfcdState = true;
this.yfcheckList = [];
},
openMarkDialog(){
this.MarkState = true;
this.MarkList = [];
},
goUrlZD(item) {
let that = this;
let yfcheckList
......@@ -2167,6 +2330,28 @@
null
);
},
getMarkList(){
if(this.MarkFrIds===""){return this.$message.error('请输入单号查询');}
this.MarkLoading = true
this.apipost(
"Financial_post_GetALLPageList",
{pageIndex: 1,pageSize: 5,IsFormRecPayQuery: 1,RB_Branch_Id: -1,Status: "-1",IsSellOrderForm:1,FrIDs:this.MarkFrIds},
res => {
this.MarkLoading = false
if (res.data.resultCode === 1) {
this.MarkList = res.data.data.pageData.list;
let MarkCurrency='';
let MarkMoney =0;
this.MarkList.forEach(x=>{
MarkMoney += x.WBMoney;
MarkCurrency = x.CurrencyName;
});
this.MarkTotal = MarkMoney +' '+ MarkCurrency;
}
},
null
);
},
downloadczgetList() {
if (this.czdateList && this.czdateList.length > 0) {
this.czMsg.sTradeDate = this.czdateList[0];
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 6a3620d7
......@@ -2754,7 +2754,8 @@
JapanFeeRate: data.JapanFeeRate,
JapanFinanceId: data.JapanFinanceId,
FTravelID: data.FTravelID,
FTracelRemark: data.FTracelRemark
FTracelRemark: data.FTracelRemark,
JapanPayMark : data.JapanPayMark
}
this.helpBranchData={
Type:data.Type,
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 6a3620d7
......@@ -5,6 +5,10 @@
.recpayQueryMore{margin:10px 0px 5px 0px;text-align:center;cursor: pointer;}
.page_RecPayQuery .el-form-item{
margin-bottom:10px;
}
</style>
<template>
......@@ -261,6 +265,16 @@
<el-input v-model="msg.Remark"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="PIC优先付款:">
<el-select filterable v-model='msg.IsAirTicketSelect' >
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option :value="1" label="只看已标记被驳回"></el-option>
<el-option :value="2" label="只看已标记出纳未审核"></el-option>
<el-option :value="3" label="只看已标记未审核通过"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
<el-form-item label="凭证费用:">
<el-select filterable v-model='msg.KJCostTypeId' >
......
src/components/FinancialModule/components/ClientBankAccount.vue
View file @ 6a3620d7
......@@ -148,6 +148,15 @@
</div>
</div>
</div>
<div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanPayMark && clientBankAccountData.JapanPayMark.length>0">
<div v-if="clientBankAccountData.AccountCreateTime">
--------------------------------------------------
</div>
<div>
<span style="display: inline; color: red">PIC优先付款关联单：</span>
<span v-for="markFrid in clientBankAccountData.JapanPayMark" style="display: inline; cursor: pointer; color: #106BAF;" @click="goUrlDetail('FinancialDocumentsDetail',markFrid)">{{markFrid}}</span>
</div>
</div>
</div>
</template>
......
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