1

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

 <style scoped>
+  @import "../css/cssReset.css";
+
   @media print{
     ._none_print{display:none}
   }
@@ -383,7 +385,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 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>
@@ -427,15 +429,15 @@
               </td>
               <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
               <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
-              <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
+              <td v-if="qjGroupId==userInfo.Group_Id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
               <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
               <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
               <td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
               <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
                             || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
                             || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
-                            || GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
-              <td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
+                            || GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.Group_Id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
+              <td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.Group_Id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
               <td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>
             </tr>
           </table>
@@ -872,6 +874,9 @@
   import huijiBill from "../components/huijiBill.vue";
 
   import czBillModule from "../components/czBillModule.vue";
+
+  import {UploadSelfFile} from '../../../api/common/common'
+
   export default {
     data(){
       return{
@@ -974,11 +979,11 @@
       this.ID = this.$route.query.id;
       this.pageIndex = this.$route.query.pageIndex;
       let userinfo = this.getLocalStorage();
-      this.bossID = userinfo.EmployeeId;
-      let ActionMenuCode=userinfo.ActionMenuCode;
-      if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
-        this.huijiShow=true;
-      }
+      this.bossID = userinfo.Id;
+      // let ActionMenuCode=userinfo.ActionMenuCode;
+      // if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
+      //   this.huijiShow=true;
+      // }
     },
     methods:{
       GetAuth() {
@@ -1195,13 +1200,13 @@
       goPrintPageNew(type,id,Merge,OrderSource){
         if(type===1){
           let routeData = this.$router.resolve({
-            name: 'PrintPageN',
+            path: '/financial/financalDocument/PrintPageN',
             query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
           });
           window.open(routeData.href, "_blank");
         }else{
           let routeData = this.$router.resolve({
-            name: 'PrintPageN',
+            path: '/financial/financalDocument/PrintPageN',
             query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
           });
           window.open(routeData.href, "_blank");
@@ -1224,31 +1229,15 @@
       },
       goPrintPage(type,id,Merge,OrderSource){
         if(type===1){
-          // this.$confirm('是否打印客户联？', '提示', {
-          //     confirmButtonText: '确定',
-          //     cancelButtonText: '取消',
-          //     type: 'warning'
-          // }).then(() => {
-          //     let routeData = this.$router.resolve({
-          //         name: 'PrintPage',
-          //         query: { type: type,id:id,isKehu:1}
-          //     });
-          //     window.open(routeData.href, "_blank");
-          // }).catch(() => {
-          //     let routeData = this.$router.resolve({
-          //         name: 'PrintPage',
-          //         query: { type: type,id:id,isKehu:0}
-          //     });
-          //     window.open(routeData.href, "_blank");
-          // });
+
           let routeData = this.$router.resolve({
-            name: 'PrintPage',
+            path: '/financial/financalDocument/PrintPage',
             query: { type: type,id:id,isKehu:0,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
           });
           window.open(routeData.href, "_blank");
         }else{
           let routeData = this.$router.resolve({
-            name: 'PrintPage',
+            path: '/financial/financalDocument/PrintPage',
             query: { type: type,id:id,Merge:Merge,OrderSource:OrderSource?OrderSource:-1}
           });
           window.open(routeData.href, "_blank");
@@ -1389,12 +1378,12 @@
         newArr.push(file.file)
         let path = "/Upload/Temporary/"
         this.$message.info('上传中...')
-        this.UploadSelfFileT(path, newArr, x => {
+        UploadSelfFile('Temporary', file.file, x => {
           let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
           this.saveMsg.push({
             Type:fileTypeNumber,
-            Content: x.data.FilePath,
-            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+            Content: x.FileUrl,
+            Url:x.FileUrl,
           });
           this.$message.success('上传成功');
         });
@@ -1460,6 +1449,7 @@
       },
       showImg(obj, type){
         let isExsit=false
+        console.log(this.images)
         this.images.forEach(x=>{
           if(x==obj)
             isExsit=true

src/pages/financial/financalDocument/PrintPage.vue

+<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;
+    /* page-break-after: always; */
+  }
+  /* @media print {
+      ._PrintPage{
+          margin-left:-145px;
+      }
+  } */
+</style>
+<template v-loading="loading">
+  <div class="_PrintPage">
+    <div class="_PrintPage_box">
+      <template v-if="type==='2'&&(Merge==='0'||Merge===null)">
+        <div class="_border_1" v-for="(item,index) in loopNumT">
+          <my-Bill :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="_border_1" v-for="(item,index) in loopNumN">
+          <my-RVB-Bill 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>
+        </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>
+    </div>
+  </div>
+</template>
+<script>
+  import myBill from "../components/BillModule.vue";
+  import myrbvBill from "../components/ReceivablesModule.vue";
+  import myhrBill from "../components/MergeBillModule.vue";
+  import myGZBill from "../components/GZBillModule.vue";
+  export default {
+    data(){
+      return{
+        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
+      }
+    },components:{
+      'my-Bill': myBill,
+      'my-RVB-Bill':myrbvBill,
+      'my-HB-Bill':myhrBill,
+      'my-GZ-Bill': myGZBill
+    },methods:{
+      numAdd(){
+        this.num = this.num + 1
+      }
+    },mounted(){
+
+    },created(){
+      this.id = this.$route.query.id;
+      this.type = this.$route.query.type;
+      this.isKehu = this.$route.query.isKehu;
+      this.Merge = this.$route.query.Merge;
+      this.OrderSource = this.$route.query.OrderSource;
+    }
+  }
+</script>

src/pages/financial/financalDocument/PrintPageN.vue

+<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="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 @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>
+        </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>
+        </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>
+        </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 @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>
+        </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>
+        </div>
+      </template>
+      <template v-if="(Merge==='1' && hedan==2)">
+        <div class="SetDiv">
+          <span @click="goUrl(2)">切换</span>
+          <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="type=='4' && 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 "../components/BillModuleNew.vue";
+  import myrbvBill from "../components/ReceivablesModuleNew.vue";
+  import myhrBill from "../components/MergeBillModuleNew.vue";
+  import myGZBill from "../components/GZBillModule.vue";
+  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,
+      }
+    },components:{
+      'my-Bill': myBill,
+      'my-RVB-Bill':myrbvBill,
+      'my-HB-Bill':myhrBill,
+      'my-GZ-Bill': myGZBill,
+      'my-Capital':myCapital,
+    },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;
+      }
+      this.Merge = this.$route.query.Merge;
+      this.OrderSource = this.$route.query.OrderSource;
+      if(this.$route.query.Capital){
+        this.CapitalState=true;
+      }
+
+    }
+  }
+</script>

src/router/routes.js

@@ -284,8 +284,9 @@ const routes = [{
       {
         path: "/financial/financalDocument/FinancialDocumentsDetail",  //我的财务单据详情
         component: () =>
-        import("pages/financial/financalDocument/FinancialDocumentsDetail.vue")
+          import("pages/financial/financalDocument/FinancialDocumentsDetail.vue")
       },
+
       {
         path: "/test", //API测试
         component: () =>
@@ -296,6 +297,16 @@ const routes = [{
 
   // Always leave this as last one,
   // but you can also remove it
+  {
+    path: "/financial/financalDocument/PrintPage",  //财务单据打印
+    component: () =>
+      import("pages/financial/financalDocument/PrintPage.vue")
+  },
+  {
+    path: "/financial/financalDocument/PrintPageN",  //财务凭证打印
+    component: () =>
+      import("pages/financial/financalDocument/PrintPageN.vue")
+  },
   {
     path: "*",
     component: () =>