Skip to content

S
SuperMan
Commit a10ec2cb authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 210215f0
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 34 deletions
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ a10ec2cb
......@@ -10,6 +10,10 @@
cursor: pointer;
text-decoration: underline;
}
.czBillModule td{
text-align: center!important;
padding:6px 0!important;
}
</style>
<template>
<div class="m_TicketingModule">
......@@ -22,7 +26,7 @@
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th>单号</th>
<th>公司</th>
......@@ -33,7 +37,7 @@
<th>冲抵金额</th>
</tr>
<tr class="_color_b" v-for="(item,index) in czList" :key="index">
<td>{{item.FrID}}</td>
<td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
<td>{{item.BranchName}}</td>
<td>{{item.CostTypeName}}</td>
<td>{{item.CurrencyName}}</td>
......@@ -53,7 +57,7 @@
</div>
</div>
<div v-show="tableShow1" class="sanjiao-box _padding_20_15">
<table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th>单号</th>
<th>公司</th>
......@@ -65,7 +69,7 @@
</tr>
<tr class="_color_b" v-for="(item,index) in czTableList" :key="index">
<td>{{item.FrID}}</td>
<td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
<td>{{item.BranchName}}</td>
<td>{{item.CostTypeName}}</td>
<td>{{item.CurrencyName}}</td>
......
src/components/FinancialModule/ReportForm/RevenueFileMan.vue
View file @ a10ec2cb
......@@ -8,7 +8,7 @@
<el-input class="w200" v-model="msg.Title"></el-input>
</span>
</li>
<li v-if="EmployeeId==1">
<li v-if="EmployeeId==1 || EmployeeId==5">
<span>
<em>员工</em>
</span>
......@@ -27,6 +27,17 @@
<el-option label="已确认" :value='2'></el-option>
</el-select>
</li>
<li>
<span>
<em>营收月份</em>
</span>
<el-date-picker class="w220"
v-model="msg.Date"
type="month"
value-format="yyyy-MM"
placeholder="选择月">
</el-date-picker>
</li>
<li style="float:right;margin-bottom:10px">
<input
......@@ -36,7 +47,7 @@
@click="getList()"
>
<!-- -->
<input v-if="EmployeeId==1"
<input v-if="EmployeeId==1 || EmployeeId==5"
type="button"
class="hollowFixedBtn"
value="新增"
......@@ -47,28 +58,31 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>标题</th>
<th>营收月份</th>
<th>接收人</th>
<th>描述</th>
<th>状态</th>
<th>签名图片</th>
<th>文件列表</th>
<th>签名时间</th>
<th>签名图片</th>
<th width="100">签名时间</th>
<th>创建人/时间</th>
<th>操作</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.Title}}</td>
<td>{{item.Date}}</td>
<td>{{item.EmName}}</td>
<td>{{item.Description}}</td>
<td>{{item.ConfirmStatusName}}</td>
<td style="padding:6px 0">
<img v-if="item.SignImage" style="width:45px;height:45px" :src="item.SignImage" alt="">
</td>
<td>
<p v-for="(list,index1) in item.EAddressList" :key="index1">
<a :download="list.Name" style="text-decoration: underline;cursor: pointer;padding-top:4px" :href="list.Path">{{list.Name}}</a>
</p>
</td>
<td style="padding:6px 0">
<img v-if="item.SignImage" style="width:45px;height:45px" :src="item.SignImage" alt="">
</td>
<td>
<span v-if="item.ConfirmStatus==1"></span>
<span v-else>{{item.UpdateDate}}</span>
......@@ -100,8 +114,8 @@
<el-dialog
title="营收文件"
:visible.sync="ruleVisible"
width="800px">
<el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="100px">
width="690px">
<el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="80px">
<el-form-item label="标题" prop="Title">
<el-input class="w220" v-model="addMsg.Title"></el-input>
</el-form-item>
......@@ -111,10 +125,18 @@
<el-option v-for="item in EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'></el-option>
</el-select>
</el-form-item>
<el-form-item label="营收月份" prop="Date">
<el-date-picker class="w220"
v-model="addMsg.Date"
type="month"
value-format="yyyy-MM"
placeholder="选择月">
</el-date-picker>
</el-form-item>
<el-form-item label="描述" >
<el-input style="width:543px" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" v-model="addMsg.Description"></el-input>
<el-input style="width:525px" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" v-model="addMsg.Description"></el-input>
</el-form-item>
<div style="padding-left:100px" class="_addUpload_box clearfix">
<div style="padding-left:80px" class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
......@@ -188,6 +210,7 @@ export default {
ConfirmStatus:0,
pageIndex:1,
pageSize:10,
Date:'',
},
dataList:[],
loading:false,
......@@ -203,7 +226,10 @@ export default {
},
rules:{
Title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
EmployeeId: [{ required: true, message: '请选择接收人', trigger: 'change' }]
EmployeeId: [{ required: true, message: '请选择接收人', trigger: 'change' }],
Date: [
{ type: 'string', required: true, message: '请选择时间', trigger: 'change' }
],
},
EmployeeId:'',
saveMsg:[],
......@@ -238,13 +264,13 @@ export default {
this.EmployeeId=userInfo.EmployeeId;
},
mounted(){
this.getList();
this.getEmployeeList();
let canvas = this.$refs.canvasF
canvas.height = this.$refs.canvasHW.offsetHeight - 100
canvas.width = this.$refs.canvasHW.offsetWidth - 10
this.canvasTxt = canvas.getContext('2d')
this.stageInfo = canvas.getBoundingClientRect()
this.getList();
this.getEmployeeList();
let canvas = this.$refs.canvasF
canvas.height = this.$refs.canvasHW.offsetHeight - 100
canvas.width = this.$refs.canvasHW.offsetWidth - 10
this.canvasTxt = canvas.getContext('2d')
this.stageInfo = canvas.getBoundingClientRect()
},
filters:{
......@@ -489,6 +515,7 @@ export default {
SetRules(item){
this.ruleVisible=true;
this.addMsg=Object.assign({},item);
this.saveMsg=[];
// 1 文档 2 数据 3 图片
let typeArr=[
......@@ -562,6 +589,7 @@ export default {
Title:'',
EAddressList:[],
Description:'',
Date:'',
}
},
deleteUploadFile(i){ // 删除上传文件
......@@ -610,7 +638,7 @@ export default {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
PostId: '28',
IsLeave: '0'
}
this.apipost(
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ a10ec2cb
......@@ -855,11 +855,6 @@ export default {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
},
AddFinancial(z){ //保存
// if(this.orderObj&&this.orderObj.CurrencyId){
// this.msg.detailList=[];
// this.msg.detailList.push(this.detailList);
// }
if(z){
this.msg.Status = 0;
}else{
......@@ -939,6 +934,7 @@ export default {
}
this.loading = true;
this.msg.Description=this.Description;
// 预付款冲抵
if(this.czmsgState){
this.msg.ReFinanceId=this.czmsg.ReFinanceId;
......
src/components/leaderPay2.vue
View file @ a10ec2cb
......@@ -36,6 +36,7 @@
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
outline: none;
}
.normalBtn:hover {
......@@ -138,6 +139,7 @@
border: 1px solid #e95252;
cursor: pointer;
border-radius: 15px;
outline:none;
}
.cursorpointer {
......@@ -1072,8 +1074,8 @@
<el-dialog title="预付款冲抵" width="860px" :visible.sync="cdState" center>
<el-form class="cdForm" label-width="90px">
<el-form-item label="单据">
<el-input class="w220" v-model="czMsg.FrID"></el-input>
<el-form-item label="单号" prop="FrID">
<el-input class="w220" @keyup.native="checkInteger(czMsg,'FrID')" v-model="czMsg.FrID"></el-input>
</el-form-item>
<el-form-item label="费用类型">
<el-select filterable v-model='czMsg.CostTypeID' class="">
......@@ -1146,10 +1148,11 @@
czMsg:{
pageIndex:1,
pageSize:8,
FrID:0,
FrID:'',
CostTypeID:'',
sTradeDate:'',
eTradeDate:'',
IsAdvanceFinance:1,
},
checkList:[],
cdState:false,
......@@ -1297,9 +1300,12 @@
this.czMsg.sTradeDate='';
this.czMsg.eTradeDate='';
}
this.apipost("Financial_get_GetAdvanceFinancePageList", this.czMsg, res => {
let msg=Object.assign({},this.czMsg);
if(msg.FrID==''){
msg.FrID=0;
}
this.apipost("Financial_get_GetAdvanceFinancePageList", msg, res => {
if (res.data.resultCode === 1) {
this.czList = res.data.data.pageData;
this.total2=res.data.data.count;
}
......
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