修改

src/pages/financial/components/huijiBill.vue

@@ -85,6 +85,16 @@
     color: #FFFFFF;
     font-size: 12px;
   }
+  ._sanjiaoTwo:after{
+    content: '部';
+    position: absolute;
+    top: -15px;
+    left: -14px;
+    white-space: nowrap;
+    color: #FFFFFF;
+    font-size: 12px;
+  }
+
   ._border_1{
     background: #fff;
     padding: 15px;
@@ -100,12 +110,13 @@
 
     <div v-show="disabled">
       <div :class="loopNumN!=1?'borderColor':'_border_1'" class="_border_1" v-for="(val,index) in loopNumN" :key="index">
-        <div class="_sanjiao_"></div>
+        <div v-if="GetDetail.FinanceAccountantMergeType==1" class="_sanjiao_ _sanjiaoTwo"></div>
+        <div v-else class="_sanjiao_"></div>
         <p class="rb_tit">{{GetDetail.CompanyName}}</p>
         <table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
           <tr>
             <th rowspan="2">{{$t('system.query_company')}}</th>
-            <th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
+            <th rowspan="2" v-if="GetDetail.FinanceAccountantMergeType!=1">{{$t('visa.v_tuanhao')}}</th>
             <th rowspan="2">{{$t('fnc.danhao')}}</th>
             <th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
             <th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
@@ -123,7 +134,7 @@
           <template v-if="GetDetail.AccountantMergeDetailList&&GetDetail.AccountantMergeDetailList.length">
             <tr v-for="(item) in GetDetail.AccountantMergeDetailList" class="_color_b">
               <td height="34px">{{item.BName}}</td>
-              <td height="34px">
+              <td height="34px" v-if="GetDetail.FinanceAccountantMergeType!=1">
                 <template v-for="tc in item.TCIDAndTCNUMList">
                   <p class="_jump_page" @click="jumpPage('productQuery',tc.TCID,1)">
                     <span v-if="GetDetail.Type==1">{{tc.TCNUM}}</span>
@@ -448,6 +459,7 @@
     },watch: {  // 监听参数变化
       GetDetail: {
         handler: function(val, oldVal) {
+          console.log(val,'val');
         },
         deep: true
       },

src/pages/financial/financalDocument/batchVoucher.vue

@@ -2129,7 +2129,16 @@
         }
         this.msg.FinanceDepartList = this.commonFinance
         this.msg.detailList[0]=this.commonDetailList;
+        this.msg.Status=1;
         delete this.msg.DetailList;
+        if(this.msg.detailList[0].Rate==''){
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请选择币种`
+          })
+          return
+        }
         this.apipost('Financial_post_BatchSet', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.$q.notify({