update

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -277,6 +277,8 @@
 <template>
     <div class="CapitalDetail">
         <span class="Ca_Span">{{$t('fnc.zjdbodan')}}</span>
+        <p v-show="huijiShow"  @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)" style="color: #3980C8;font-size:12px;text-align:right;cursor: pointer;width:830px;margin-bottom:20px">凭证打印</p>
+
         <div class="clearfix">
             <div class="Co_oderleft">
               <div class="Ca_leftOrder">
@@ -635,14 +637,35 @@ export default {
       GetDetail:{
         AuditSteps:[]
       },
-      endDate: ''
+      endDate: '',
+      huijiShow:false,
     }
   },
-  create(){
+  created(){
     let userinfo = this.getLocalStorage();
     this.bossID = userinfo.EmployeeId;
+    let ActionMenuCode=userinfo.ActionMenuCode;
+      if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
+        this.huijiShow=true;
+      }
+    console.log("huijiShow",this.huijiShow)
   },
   methods:{
+    goPrintPageNew(type,id,Merge,OrderSource){
+          if(type===1){
+              let routeData = this.$router.resolve({
+                  name: 'PrintPageN',
+                  query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
+              });
+              window.open(routeData.href, "_blank");
+          }else{
+              let routeData = this.$router.resolve({
+                  name: 'PrintPageN',
+                  query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1,Capital:1}
+              });
+              window.open(routeData.href, "_blank");
+          }
+    },
     inited (viewer){
       this.$viewer = viewer
     },

src/components/PrintPageN.vue

@@ -37,7 +37,7 @@
 <template v-loading="loading">
     <div class="_PrintPage">
         <div class="_PrintPage_box">
-            <template v-if="type==='2'&&(Merge==='0' || Merge==='1' ||Merge===null)">
+            <template v-if="type==='2'&&(Merge==='0' ||Merge===null)">
                 <div class="SetDiv">
                     <span @click="disabled=false">编辑</span>
                     <span @click="disabled=true">保存</span>
@@ -60,22 +60,39 @@
                     <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'">
-              <div class="_border_1" v-for="(item,index) in loopNumN">
-                <my-HB-Bill 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="Merge==='1'">
+                <div class="SetDiv">
+                    <span @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>
+                </div>
+            </template>
+            <template v-if="CapitalState">
+                <div class="SetDiv">
+                    <span @click="disabled3=false">编辑</span>
+                    <span @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>
+                </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/MergeBillModule.vue";
+import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue";
 import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
+import myCapital from "./FinancialModule/FinancialSubmodule/myCapital.vue";
+
 export default {
     data(){
         return{
+            disabled3:true,
+            disabled2:true,
             disabled1:true,
             disabled:true,
             loading:true,
@@ -88,13 +105,15 @@ export default {
             loopNumN:this.$route.query.isKehu==='1'?3:2,
             loopNumT:2,
             Merge:null,
-            OrderSource:-1
+            OrderSource:-1,
+            CapitalState:false,
         }
     },components:{
         'my-Bill': myBill,
         'my-RVB-Bill':myrbvBill,
         'my-HB-Bill':myhrBill,
-        'my-GZ-Bill': myGZBill
+        'my-GZ-Bill': myGZBill,
+        'my-Capital':myCapital
     },methods:{
         numAdd(){ 
             this.num = this.num + 1
@@ -107,6 +126,10 @@ export default {
         this.isKehu = this.$route.query.isKehu;
         this.Merge = this.$route.query.Merge;
         this.OrderSource = this.$route.query.OrderSource;
+        if(this.$route.query.Capital){
+            this.CapitalState=true;
+        }
+        
   }
 }
 </script>