Qukatie 1 년 전
부모
커밋
5d1fbad852
2개의 변경된 파일87개의 추가작업 그리고 8개의 파일을 삭제
  1. 60 1
      src/router/views/index.js
  2. 27 7
      src/views/iosBasicData/periodManagement/index.vue

+ 60 - 1
src/router/views/index.js

@@ -3409,5 +3409,64 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/system/copy/index')
     }]
   },
-
+    // 工作申请
+    {
+      path: '/iosBasicData/release/jobApplication/index',
+      component: Layout,
+      hidden: true,
+      children: [{
+        path: '/iosBasicData/release/jobApplication/index',
+        name: '工作申请',
+        meta: {
+          i18n: '/iosBasicData/release/jobApplication/index',
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/release/jobApplication/index')
+      }]
+    },
+      // 调度管理
+      {
+        path: '/iosBasicData/release/schedulingManagement/index',
+        component: Layout,
+        hidden: true,
+        children: [{
+          path: '/iosBasicData/release/schedulingManagement/index',
+          name: '调度管理',
+          meta: {
+            i18n: '/iosBasicData/release/schedulingManagement/index',
+            keepAlive: true,
+          },
+          component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/release/schedulingManagement/index')
+        }]
+      },
+        // 放单管理
+    {
+      path: '/iosBasicData/release/releaseManagement/index',
+      component: Layout,
+      hidden: true,
+      children: [{
+        path: '/iosBasicData/release/releaseManagement/index',
+        name: '放单管理',
+        meta: {
+          i18n: '/iosBasicData/release/releaseManagement/index',
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/release/releaseManagement/index')
+      }]
+    },
+           // 期间管理
+           {
+            path: '/iosBasicData/periodManagement/index',
+            component: Layout,
+            hidden: true,
+            children: [{
+              path: '/iosBasicData/periodManagement/index',
+              name: '期间管理(F)',
+              meta: {
+                i18n: '/iosBasicData/periodManagement/index',
+                keepAlive: true,
+              },
+              component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/periodManagement/index')
+            }]
+          },
 ]

+ 27 - 7
src/views/iosBasicData/periodManagement/index.vue

@@ -86,7 +86,7 @@
             </span>
             <span slot="footer" class="dialog-footer">
                 <el-button size="mini" @click="openDialog2 = false">取 消</el-button>
-                <el-button size="mini" type="primary" @click="exportBut()">导 出</el-button>
+                <el-button size="mini" type="primary" @click="exportExcel(1)">导 出</el-button>
             </span>
         </el-dialog>
         <el-dialog v-dialogdrag append-to-body title="凭证未记账数据" :visible.sync="openDialog3" width="50%"
@@ -96,7 +96,7 @@
             </span>
             <span slot="footer" class="dialog-footer">
                 <el-button size="mini" @click="openDialog3 = false">取 消</el-button>
-                <el-button size="mini" type="primary" @click="exportBut2()">导 出</el-button>
+                <el-button size="mini" type="primary" @click="exportExcel(2)">导 出</el-button>
             </span>
         </el-dialog>
     </div>
@@ -106,7 +106,7 @@
 import { getList, currentPeriod, open, init, locking, revokeLocking, close, unclose, generateVouchers, submitPeriod, getPeriodExchangeRate } from "@/api/iosBasicData/periodManagement";
 import detailsPage from "./detailsPage"
 import { defaultDate4 } from "@/util/date";
-
+import { getToken } from "@/util/auth";
 export default {
     name: "index",
     components: {
@@ -114,6 +114,7 @@ export default {
     },
     data() {
         return {
+            itemId:null,
             dialogOption: {
                 viewBtn: false,
                 editBtn: false,
@@ -449,6 +450,21 @@ export default {
         this.option2 = await this.getColumnData(this.getColumnName(367), this.optionList2);
     },
     methods: {
+        exportExcel(type) {
+            const routeData = this.$router.resolve({
+                path: '/api/blade-los/finperiod/export',      //跳转目标窗口的地址
+                query: {
+                    'Blade-Auth': getToken(),
+                    'id':this.itemId,
+                }
+            })
+            window.open(routeData.href.slice(1, routeData.href.length));
+            if(type==1){
+                this.handleClose3()
+            }else{
+                this.handleClose4()
+            }
+        },
         lock(row, type) {
             if (type == '1') {
                 this.$confirm('是否锁定?', '提示', {
@@ -461,16 +477,18 @@ export default {
                         if (res.data.msg == '审核未通过') {
                             this.loading = false
                             this.openDialog2 = true
-                            this.dialogData=res.data.data
-                        }else if(res.data.msg=='凭证未记账'){
+                            this.itemId=row.id
+                            this.dialogData = res.data.data
+                        } else if (res.data.msg == '凭证未记账') {
                             this.loading = false
                             this.openDialog3 = true
-                            this.dialogData2=res.data.data
+                            this.itemId=row.id
+                            this.dialogData2 = res.data.data
                         } else {
                             this.loading = false
                             this.$message.success("锁定成功");
                             this.handleClick(this.activeName)
-                            
+
                         }
 
                     })
@@ -544,10 +562,12 @@ export default {
             this.itemOpenDialog = false
         },
         handleClose3() {
+            this.itemId=null
             this.dialogData = []
             this.openDialog2 = false
         },
         handleClose4() {
+            this.itemId=null
             this.dialogData2 = []
             this.openDialog3 = false
         },