update

src/components/FinancialModule/BasicDocuments.vue

@@ -301,7 +301,10 @@
 <template>
     <div class="page_bdm" v-if="GetDetail" v-loading="loading">
         <p class="_tit">{{GetDetail.FinanceName}} <span style="color: red;" v-if="GetDetail.Status==4">已作废</span></p>
+       
+        
         <div v-if="GetDetail.TemplateId==36 || GetDetail.TemplateId==37 || GetDetail.TemplateId==53 ||GetDetail.TemplateId==48 || (GetDetail.TemplateId==43&&GetDetail.IsPublic==4) || (GetDetail.TemplateId==56&&GetDetail.IsPublic==4)" style="width: 890px;text-align: right;font-size:12px;cursor: pointer;color: #3980C8;" @click="goUrlApplication('Application',GetDetail.FrID)">
+            <span 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">凭证打印</span>
             <span v-if="GetDetail.FApplyForNumber&&GetDetail.FApplyForNumber!=''">申请书{{GetDetail.FApplyForNumber}}下载</span>
             <span v-else>未提交申请书</span>
         </div>
@@ -1488,6 +1491,7 @@ export default {
             MsgUrl: true,
             CostTypeState:false,
             LeadState:false,
+            huijiShow:false,
         }
     },
     components:{
@@ -1507,6 +1511,21 @@ export default {
         'myJiPiaoBill': myJiPiaoBill
     },
     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");
+            }
+        },
         goHand(type,GetDetail){
             if(type==1){
                 this.$router.push({
@@ -2625,6 +2644,11 @@ export default {
             this.pageIndex = this.$route.query.pageIndex;
         }
         this.ISGZ = this.$route.query.ISGZ ? true : false;
+        let userinfo = this.getLocalStorage();
+        let ActionMenuCode=userinfo.ActionMenuCode;
+      if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
+        this.huijiShow=true;
+      }
     },mounted(){
         let userInfo=this.getLocalStorage();
         this.userId = userInfo.EmployeeId;

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -648,7 +648,6 @@ export default {
       if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
         this.huijiShow=true;
       }
-    console.log("huijiShow",this.huijiShow)
   },
   methods:{
     goPrintPageNew(type,id,Merge,OrderSource){

src/components/FinancialModule/FinancialSubmodule/MergeBillModuleNew.vue

@@ -122,7 +122,10 @@
                 <td height="34px">{{item.BName}}</td>
                 <td height="34px">
                     <template v-for="tc in item.TCIDAndTCNUMList">
-                        <p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">{{tc.TCNUM}}({{tc.TCID}})</p>
+                        <p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">
+                          <span v-if="GetDetail.Type==1">{{tc.TCNUM}}</span>
+                          <span v-if="GetDetail.Type==2">{{tc.TCID}}</span>
+                        </p>
                     </template>
                 </td>
                 <td height="34px">{{item.FinanceId}}</td>
@@ -244,13 +247,13 @@
             <template v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length">
                 <tr v-for="(item) in GetDetail.MergeDetailList" class="_color_b">
                 <td height="34px">
-                    <el-input size="small" style="width:auto" v-model="item.BName" placeholder="请输入"></el-input>
+                    <el-input size="small" style="width:80px" v-model="item.BName" placeholder="请输入"></el-input>
                 </td>
                 <td height="34px">
                     <template v-for="tc in item.TCIDAndTCNUMList">
                         <p class="_jump_page">
-                            <el-input size="small" style="width:auto" v-model="tc.TCNUM" placeholder="请输入"></el-input>
-                            <el-input size="small" style="width:auto" v-model="tc.TCID" placeholder="请输入"></el-input>
+                            <el-input v-if="GetDetail.Type==1" size="small" style="width:auto;display:inline-block;width:120px" v-model="tc.TCNUM" placeholder="请输入"></el-input>
+                            <el-input v-if="GetDetail.Type==2" style="display:inline-block;width:120px;" size="small" v-model="tc.TCID" placeholder="请输入"></el-input>
                         </p>
                     </template>
                 </td>
@@ -259,7 +262,7 @@
                 <!--<td height="34px">{{item.Number}}</td>-->
                 <!--<td height="34px">{{item.UnitPrice}}</td>-->
                 <td height="34px">
-                    <el-input size="small" style="width:auto" v-model="item.CurrencyName" placeholder="请输入"></el-input>
+                    <el-input size="small" style="width:80px" v-model="item.CurrencyName" placeholder="请输入"></el-input>
                 </td>
                 <td height="34px">{{item.OriginalMoney}}</td>
                 <td height="34px">{{item.Rate}}</td>
@@ -321,12 +324,12 @@
                 <template v-for="(item,index) in GetDetail.MergeBankList">
                     <p  class="_fex_cen clearfix">
                         <span class="_bold">
-                            <el-input size="small" style="width:auto" v-model="item.Alias" placeholder="请输入"></el-input>
+                            <el-input size="small" style="width:120px" v-model="item.Alias" placeholder="请输入"></el-input>
                             -
-                            <el-input size="small" style="width:auto" v-model="item.TypeName" placeholder="请输入"></el-input>
+                            <el-input size="small" style="width:120px" v-model="item.TypeName" placeholder="请输入"></el-input>
                             -
-                            <el-input size="small" style="width:auto" v-model="item.AccountType" placeholder="请输入"></el-input>
-                            <el-input size="small" style="width:auto" v-model="item.BankNo" placeholder="请输入"></el-input>
+                            <el-input size="small" style="width:120px" v-model="item.AccountType" placeholder="请输入"></el-input>
+                            <el-input size="small" style="width:120px" v-model="item.BankNo" placeholder="请输入"></el-input>
                         </span>
                         <!-- {{item.Alias}}-</span><span class="_bank_name">{{item.TypeName}}-</span>
                         <span class="_bank_type" :class="item.AccountType=='对私'?'':'_bank_type2'">

src/components/PrintPageN.vue

@@ -69,7 +69,7 @@
                     <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">
+            <template v-if="type=='4' && CapitalState">
                 <div class="SetDiv">
                     <span @click="disabled3=false">编辑</span>
                     <span @click="disabled3=true">保存</span>