Skip to content

C
confucius
Commit 765c2181 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 8cc1a0e8
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 92 deletions
src/pages/financial/addFinancialProcess.vue
View file @ 765c2181
......@@ -594,27 +594,7 @@
{
id: 6,
name: this.$t('fnc.kjchuangkou')
},
{
id: 7,
name: this.$t('fnc.xiankong')
},
{
id: 8,
name: this.$t('fnc.jzchuna')
},
{
id: 9,
name: this.$t('fnc.skchuna')
},
{
id: 10,
name: "分公司OP"
},
{
id: 11,
name: "总部线控"
},
}
],
accListMsg: [],
SpecialNodeSelectType: '',
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 765c2181
......@@ -386,7 +386,7 @@
</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>
<span class="_Printing" style="margin-left:10px;" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
</div>
<div class="_conten">
......
src/pages/financial/financalDocument/PrintPageN.vue
View file @ 765c2181
<style scoped>
._PrintPage{
._PrintPage {
width: 100%;
background-color: white;
position: absolute;
padding-top: 20px;
}
._PrintPage_box{
._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{
._PrintPage_box {
position: relative;
}
._PrintPage_box .SetDiv{
._PrintPage_box .SetDiv {
position: absolute;
top:10px;
color:#106BAF;
top: 10px;
color: #106BAF;
left: -190px;
}
._PrintPage_box .SetDiv span{
color:#106BAF;
._PrintPage_box .SetDiv span {
color: #106BAF;
cursor: pointer;
}
</style>
<template v-loading="loading">
<div class="_PrintPage">
......@@ -40,54 +35,62 @@
<template v-if="type==='2'&&(Merge==='0' || Merge===null || (Merge==='1' && hedan==1)) ">
<div class="SetDiv">
<span v-if="Merge==='1' " @click="goUrl(1)">切换</span>
<span @click="disabled=false">编辑</span>
<span style="margin:0 10px;" @click="disabled=false">编辑</span>
<span @click="disabled=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-Bill :loopNumN="loopNumN" :disabled.sysc="disabled" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill>
<my-Bill :loopNumN="loopNumN" :disabled.sysc="disabled" :ID="id" :width="widthSon" :isPrintPage="true"
:color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill>
</div>
</template>
<template v-else-if="type==='1'&&(Merge==='0'||Merge===null)">
<div class="SetDiv">
<span @click="disabled1=false">编辑</span>
<span @click="disabled1=true">保存</span>
<span style="margin-left:10px;" @click="disabled1=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-RVB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
<my-RVB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id"
:width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'>
</my-RVB-Bill>
</div>
</template>
<template v-else-if="type==='1'&&(Merge==='1'&&hedan==1)">
<div class="SetDiv">
<span v-if="Merge==='1' " @click="goUrl(1)">切换</span>
<span @click="disabled1=false">编辑</span>
<span style="margin:0 10px;" @click="disabled1=false">编辑</span>
<span @click="disabled1=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-RVB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
<my-RVB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id"
:width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'>
</my-RVB-Bill>
</div>
</template>
<template v-if="type==='7'&&(Merge==='0'||Merge===null)">
<div class="_border_1" v-for="(item,index) in loopNumT">
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource"
:name='index+1'></my-GZ-Bill>
</div>
</template>
<template v-if="(Merge==='1' && hedan==2)">
<div class="SetDiv">
<span @click="goUrl(2)">切换</span>
<span @click="disabled2=false">编辑</span>
<span style="margin:0 10px;" @click="disabled2=false">编辑</span>
<span @click="disabled2=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-HB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled2" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
<my-HB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled2" v-on:helloPP="numAdd" :Num="num" :ID="id"
:width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
</div>
</template>
<template v-if="type=='4' && CapitalState">
<div class="SetDiv">
<span @click="disabled3=false">编辑</span>
<span @click="disabled3=true">保存</span>
<span style="margin-left:10px;" @click="disabled3=true">保存</span>
</div>
<div class="_border_1" v-for="(item,index) in 1">
<my-Capital :loopNumN="loopNumN" :disabled.sysc="disabled3" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-Capital>
<my-Capital :loopNumN="loopNumN" :disabled.sysc="disabled3" v-on:helloPP="numAdd" :Num="num" :ID="id"
:width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-Capital>
</div>
</template>
</div>
......@@ -101,72 +104,90 @@
import myCapital from "../components/myCapital.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,
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,
}
},components:{
},
components: {
'my-Bill': myBill,
'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill,
'my-RVB-Bill': myrbvBill,
'my-HB-Bill': myhrBill,
'my-GZ-Bill': myGZBill,
'my-Capital':myCapital,
},methods:{
numAdd(){
'my-Capital': myCapital,
},
methods: {
numAdd() {
this.num = this.num + 1
},
goUrl(num){
goUrl(num) {
let hedan;
if(num==1){
hedan=2;
}else{
hedan=1;
if (num == 1) {
hedan = 2;
} else {
hedan = 1;
}
if(this.type===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}
path: '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{
} 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}
path: '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(){
},
mounted() {
},created(){
},
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.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;
if (this.$route.query.Capital) {
this.CapitalState = true;
}
}
}
</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