Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialDocuments.vue

@@ -717,7 +717,7 @@
             v-if="msg.Conditon == 3">{{BOSSBtn2 ? $t('objFill.noOneclicktransfer') : $t('objFill.oneclicktransfer')}}</button>
           <button class="hollowFixedBtn" v-if="msg.Conditon == 3 && BOSSBtn2" @click="BOSSBtnClick(2)">{{$t('fnc.zhuanjiao')}}</button>
           <button class="hollowFixedBtn" v-if="msg.Conditon == 1&&ActionMenuCode.indexOf('batchAddWages')!=-1 " @click="outerVisible=true">{{$t('objFill.payroll')}}</button>
-          <template v-if="isBatchPrinting&&msg.Conditon == 3">
+          <template v-if="msg.Conditon == 1 || (isBatchPrinting&&msg.Conditon == 3)">
             <button class="hollowFixedBtn" v-if="!BOSSBtn3"
             @click="BOSSBtn3 = true">一键打印</button>
             <button v-else class="hollowFixedBtn"