Commit 01f51096 authored by 黄媛媛's avatar 黄媛媛

update

parent 521c68f4
......@@ -475,6 +475,8 @@
<div class="_tit _tit2 w890px">
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
<huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
......@@ -1341,6 +1343,7 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue";
import { truncate } from 'fs';
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
import huijiBill from "./FinancialSubmodule/huijiBill.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1508,7 +1511,9 @@ export default {
'my-HB-Bill':myhrBill,
'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill
'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
},
methods:{
goPrintPageNew(type,id,Merge,OrderSource){
......
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
.opUl li{
display: inline-block;
margin:10px 15px 10px 0;
}
.OPcommissionPeriods .singeRowTable tr td{
padding: 8px 5px;
}
.OPcommissionPeriods .hoverSpan span:hover{
cursor: pointer;
text-decoration: underline;
color: red;
}
.opUl li em{
font-size:12px;
display:inline-block;
margin-right:15px;
}
.OPcommissionPeriods .underline{
text-decoration:underline;
cursor:pointer;
}
</style>
<template>
<div class="flexOne OPcommissionPeriods">
<div>
<ul class="opUl">
<li>
<em>姓名</em>
<el-select filterable v-model='msg.EmployeeId' >
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</li>
<li>
<em>时间</em>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
</el-date-picker>
</li>
<li>
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="getList">查询</el-button>
<!-- <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</!-->
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>姓名</th>
<th>审核数量</th>
<th>制单数量</th>
</tr>
<tr v-for="item in dataList">
<td>
<span>{{item.Name}}</span>
</td>
<td>
<span class="underline" @click="goFinal(1)">{{item.AuditNum}}</span>
</td>
<td>
<span class="underline" @click="goFinal(2)">{{item.CreateNum}}</span>
</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
data() {
return {
dialogVisible:false,
ErrorMessage:'',
Month:moment().format("YYYY-MM"),
dateList:[],
msg: {
PageIndex: 1,
PageSize: 20,
BranchId:1,
DepartmentId:'',
EmployeeId:0,
StartTime:'',
EndTime:'',
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
btnLoading:false,
btnShow:false,
djList:[],
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}
},
created() {
this.dateList[0]=moment().format("YYYY-MM-DD");
this.dateList[1]=moment().format("YYYY-MM-DD");
},
mounted() {
let userInfo = this.getLocalStorage();
this.msg.BranchId=userInfo.RB_Branch_id;
this.msg.DepartmentId=userInfo.RB_Department_Id;
this.employeeMsg.DepartmentId=userInfo.RB_Department_Id;
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('P_OPCommissionSend')!=-1){
this.btnShow=true;
}
this.getList();
this.getEmployee();
},
methods: {
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
goFinal(fin){
document.querySelector("#app").click();
this.$router.push({
name: 'documentsDetail',
query: {
Type: fin,
'blank': 'y',
}
})
},
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
PeriodsId:id,
blank: 'y',
tab: '期数详情'
}
});
},
//获取数据
getList() {
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
this.loading = true;
this.apipost(
"Financial_get_GetDepartmentAuditStatistics",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
}
}
</script>
......@@ -396,8 +396,8 @@
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
<button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
......@@ -751,6 +751,7 @@ export default {
FrIDList:[],
Type:1,
},
hbBtn:false,
hbState:false,
hbShow:false,
HandMsg:{
......@@ -955,18 +956,23 @@ export default {
},
methods:{
HebingSPLast(){
console.log("fssf",this.checkList)
this.$confirm("是否合并审批? 合并审批后不可恢复", "提示", {
if(this.checkList.length==0){
this.Error("请选择单据!");
return;
}
this.$confirm("是否合并审批?合并审批后不可取消合并", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.hbBtn=true;
this.hbMsg.FrIDList=this.checkList;
this.apipost("Financial_post_SetAccountantFinanceMerge",this.hbMsg,res => {
console.log("res,",res)
this.hbBtn=false;
if (res.data.resultCode == 1) {
this.getPageList();
}
else{
this.Error(res.data.message);
......@@ -1299,7 +1305,7 @@ export default {
this.loading= false;
this.$message.error(res.data.message);
}
this.queryInfoInit();
// this.queryInfoInit();
},err=>{})
if(this.msg.Conditon==7){
this.getMyRejectFinanceCount();
......
......@@ -383,6 +383,7 @@
申请书{{GetDetail.FApplyForNumber}}下载
</span>
<span v-show="huijiShow" class="_Printing" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span>
<span v-show="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" class="_Printing" @click="goPrintPage2(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">会计合并打印</span>
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div>
......@@ -563,6 +564,7 @@
<czBillModule :FrID='ID' />
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
<huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
</div>
<template v-if="sonTCIDList">
<div class="w890px">
......@@ -860,6 +862,8 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue";
import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
import huijiBill from "./FinancialSubmodule/huijiBill.vue";
import czBillModule from "./FinancialSubmodule/czBillModule.vue";
export default {
data(){
......@@ -951,6 +955,8 @@ export default {
'ChongDiPage': ChongDiPage,
'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
"czBillModule":czBillModule
},
created(){
......@@ -1163,6 +1169,21 @@ export default {
window.open(routeData.href, "_blank");
}
},
goPrintPage2(type,id,Merge,OrderSource){
if(type===1){
let routeData = this.$router.resolve({
name: 'PrintPageH',
query: { huiji:true,type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageH',
query: { huiji:true,type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
});
window.open(routeData.href, "_blank");
}
},
goPrintPage(type,id,Merge,OrderSource){
if(type===1){
// this.$confirm('是否打印客户联?', '提示', {
......
......@@ -383,7 +383,8 @@
EmployeeId:'',
EndDate:'',
StartDate:'',
GetDetail: {}
GetDetail: {},
disabled:true,
}
},methods:{
jumpPage(path,id,type){
......@@ -428,6 +429,7 @@
this.GetDetail = data;
this.loading=false
this.$set(this.$data,"GetDetail",data);
console.log("this.GetDetail",this.GetDetail)
}
}, err => {})
},
......
......@@ -656,15 +656,15 @@ export default {
},
getEmployeeList () {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '28',
IsLeave: '0'
}
// let msg = {
// GroupId: userInfo.RB_Group_id,
// BranchId: '-1',
// DepartmentId: '-1',
// PostId: '28',
// IsLeave: '0'
// }
this.apipost(
'admin_get_EmployeeGetList', msg,
'admin_get_GetBranchManagerList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
......
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
.opUl li{
display: inline-block;
margin:10px 15px 10px 0;
}
.OPcommissionPeriods .singeRowTable tr td{
padding: 8px 5px;
}
.OPcommissionPeriods .hoverSpan span:hover{
cursor: pointer;
text-decoration: underline;
color: red;
}
.opUl li em{
font-size:12px;
display:inline-block;
margin-right:15px;
}
.OPcommissionPeriods .underline{
text-decoration:underline;
cursor:pointer;
}
</style>
<template>
<div class="flexOne OPcommissionPeriods">
<div>
<ul class="opUl">
<li>
<em>类型</em>
<el-select v-model="msg.Type" placeholder="请选择">
<el-option label="审核" :value="1"></el-option>
<el-option label="制单" :value="2"></el-option>
</el-select>
</li>
<li>
<em>姓名</em>
<el-select filterable v-model='msg.EmployeeId' >
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</li>
<li>
<em>时间</em>
<el-date-picker
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
</el-date-picker>
</li>
<li>
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="getList">查询</el-button>
<!-- <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</!-->
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li>
</ul>
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>ID</th>
<th>审核/制单人</th>
<th>审核/制单时间</th>
<th>类型</th>
</tr>
<tr v-for="item in dataList">
<td>
<span class="underline" @click="goFinal(item.FrID)">{{item.FrID}}</span>
</td>
<td>{{item.EmName}}</td>
<td>{{item.CreateDate}}</td>
<td>{{item.Type}}</td>
</tr>
</table>
<!-- 分页 -->
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
data() {
return {
dialogVisible:false,
ErrorMessage:'',
Month:moment().format("YYYY-MM"),
dateList:[],
msg: {
PageIndex: 1,
PageSize: 20,
Type:1,
EmployeeId:0,
StartTime:'',
EndTime:'',
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
btnLoading:false,
btnShow:false,
djList:[],
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}
},
created() {
this.dateList[0]=moment().format("YYYY-MM-DD");
this.dateList[1]=moment().format("YYYY-MM-DD");
if(this.$route.query.Type){
this.msg.Type=Number(this.$route.query.Type);
}
if(this.$route.query.EmployeeId){
this.msg.EmployeeId=Number(this.$route.query.EmployeeId );
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('P_OPCommissionSend')!=-1){
this.btnShow=true;
}
this.employeeMsg.DepartmentId=userInfo.RB_Department_Id;
this.getList();
this.getEmployee();
},
methods: {
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
goFinal(fin){
document.querySelector("#app").click();
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: fin,
'blank': 'y',
}
})
},
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
PeriodsId:id,
blank: 'y',
tab: '期数详情'
}
});
},
//获取数据
getList() {
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
}
this.loading = true;
this.apipost(
"Financial_get_GetDepartmentAuditDetail",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
}
}
</script>
<style scoped>
._PrintPage{
width: 100%;
background-color: white;
position: absolute;
padding-top: 20px;
}
._PrintPage_box{
width: 1000px;
margin: 0 auto;
padding: 0 !important;
}
/* ._border_1{
border: 1px solid #333333;
margin-bottom:30px;
} */
/* @media print {
._PrintPage{
margin-left:-145px;
}
} */
._PrintPage_box{
position: relative;
}
._PrintPage_box .SetDiv{
position: absolute;
top:10px;
color:#106BAF;
left: -190px;
}
._PrintPage_box .SetDiv span{
color:#106BAF;
cursor: pointer;
}
</style>
<template v-loading="loading">
<div class="_PrintPage">
<div class="_PrintPage_box">
<template v-if="huiji">
<!-- <div class="SetDiv">
<span @click="disabled3=false">编辑</span>
<span @click="disabled3=true">保存</span>
</div> -->
<div class="_border_1" v-for="(item,index) in 1">
<huijiBill :loopNumN="loopNumN" :disabled.sysc="disabled3" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></huijiBill>
</div>
</template>
</div>
</div>
</template>
<script>
import myBill from "./FinancialModule/FinancialSubmodule/BillModuleNew.vue";
import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModuleNew.vue";
import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue";
import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
import myCapital from "./FinancialModule/FinancialSubmodule/myCapital.vue";
import huijiBill from "./FinancialModule/FinancialSubmodule/huijiBill.vue";
export default {
data(){
return{
disabled3:true,
disabled2:true,
disabled1:true,
disabled:true,
loading:true,
id:null,
type:null,
isKehu:null,
widthSon:"100%",
colorSon:"#ffffff",
num:0,
loopNumN:this.$route.query.isKehu==='1'?3:2,
loopNumT:2,
Merge:null,
OrderSource:-1,
CapitalState:false,
hedan:1,
huiji:false,
}
},components:{
'my-Bill': myBill,
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill,
'my-Capital':myCapital,
'huijiBill':huijiBill,
},methods:{
numAdd(){
this.num = this.num + 1
},
goUrl(num){
let hedan;
if(num==1){
hedan=2;
}else{
hedan=1;
}
if(this.type===1){
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { hedan:hedan,type: this.type,id:this.id,isKehu:0,Merge:this.Merge,OrderSource:this.OrderSource?this.OrderSource:-1}
});
window.open(routeData.href, "_blank");
}else{
let routeData = this.$router.resolve({
name: 'PrintPageN',
query: { hedan:hedan,type: this.type,id:this.id,Merge:this.Merge,OrderSource:this.OrderSource?this.OrderSource:-1}
});
window.open(routeData.href, "_blank");
}
},
},mounted(){
},created(){
this.id = this.$route.query.id;
this.type = this.$route.query.type;
this.isKehu = this.$route.query.isKehu;
if(this.$route.query.hedan){
this.hedan=this.$route.query.hedan;
}
if(this.$route.query.huiji){
this.huiji=true;
}
this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource;
if(this.$route.query.Capital){
this.CapitalState=true;
}
}
}
</script>
......@@ -116,7 +116,7 @@ export default {
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill,
'my-Capital':myCapital
'my-Capital':myCapital,
},methods:{
numAdd(){
this.num = this.num + 1
......@@ -151,14 +151,11 @@ export default {
if(this.$route.query.hedan){
this.hedan=this.$route.query.hedan;
}
this.Merge = this.$route.query.Merge;
this.OrderSource = this.$route.query.OrderSource;
if(this.$route.query.Capital){
this.CapitalState=true;
}
console.log("hedan",this.hedan)
console.log("Merge",this.Merge)
}
}
......
......@@ -3299,7 +3299,25 @@ export default {
meta: {
title: '收款窗口'
},
}, { //财务 财务单据 我的财务单据详情
},
{ //工作台 单据明细
path: '/documentsDetail',
name: 'documentsDetail',
component: resolve => require(['@/components/FinancialModule/documentsDetail'], resolve),
meta: {
title: '单据明细'
},
},
{ //工作台 部门审核统计
path: '/DepartmentStatistics',
name: 'DepartmentStatistics',
component: resolve => require(['@/components/FinancialModule/DepartmentStatistics'], resolve),
meta: {
title: '部门审核统计'
},
},
{ //财务 财务单据 我的财务单据详情
path: '/FinancialDocumentsDetail',
name: 'FinancialDocumentsDetail',
component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetail'], resolve),
......@@ -4444,6 +4462,14 @@ export default {
title: '财务凭证打印页面'
},
},
{ //财务打印页面
path: '/PrintPageH',
name: 'PrintPageH',
component: resolve => require(['@/components/PrintPageH'], resolve),
meta: {
title: '会计打印页面'
},
},
{
path: '/AssetsShenpi', //资产管理审批
name: 'AssetsShenpi',
......
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