修改

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -603,7 +603,7 @@
         </span>
         <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
         <button class="normalBtn" @click="goUrlWeituo('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
-        <button class="normalBtn" @click="goUrlWeituo('ChoiceAddFinancialDocuments')">批量制单</button>
+        <button class="normalBtn" @click="goUrlWeituo('ChoiceAddFinancialDocuments',1)">批量制单</button>
         <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
         <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
         <button class="hollowFixedBtn" @click="goUrlWeituo('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
@@ -2451,11 +2451,21 @@
         //   }
         // })
       },
-      goUrlWeituo(path) {
-        let tempStr = '/financial/financalDocument/' + path;
-        this.$router.push({
-          path: tempStr
-        });
+      goUrlWeituo(path,type) {
+        if(type){
+          let tempStr = '/financial/financalDocument/' + path;
+          this.$router.push({
+            path: tempStr,
+            query:{
+              isFrom:type
+            }
+          });
+        }else{
+          let tempStr = '/financial/financalDocument/' + path;
+          this.$router.push({
+            path: tempStr
+          });
+        }
       },
       goEit(type, id, edit, Conditon, pageIndex, item,iscopy=1) {//iscopy是否复制 现在只做type为1和2 
         let path = '';

src/pages/financial/returnPassbook/ReturnperiodsList.vue

@@ -99,8 +99,8 @@
                           @click="goUrl(scope.row.Id)"></i>
                     </el-tooltip>
 
-                    <el-tooltip class="item" effect="dark" content="生成财务单据" placement="top">
-                      <i class="iconfont icon-sousuo" 
+                    <el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''" content="生成财务单据" placement="top">
+                      <i class="iconfont icon-add" 
                           @click="setCommissionFinanace(scope.row.Id)"></i>
                     </el-tooltip>
                     <!-- <el-tooltip class="item" effect="dark" content="制单" placement="top" v-if='iscMaker==true'>

src/router/routes.js

@@ -532,6 +532,11 @@ const routes = [{
     component: () =>
       import("pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue")
   },
+  {
+    path: "/financial/financalDocument/batchVoucher",
+    component: () =>
+      import("pages/financial/financalDocument/batchVoucher.vue")
+  },
   {
     path: "/financial/financalDocument/addReceivablesDocuments",
     component: () =>

src/utils/request.js

@@ -13,7 +13,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=UTF-8"; //app
 
 const service = axios.create({
   baseURL: process.env.API,
-  timeout: 15000
+  timeout: 60000
 });
 
 // request拦截器