Fix：出入库导出

src/api/util.js

@@ -111,3 +111,14 @@ export function dateTimeToString (date) {
   }
   return year + '-' + month + '-' + day + ' ' + h + ':' + m + ':' + s
 }
+// 获取当月第一天
+export function getFirstDayOfMonth () {
+  let date = new Date()
+  date.setDate(1)
+  return dateToString(date)
+}
+// 获取当天
+export function getCurrentDay () {
+  let date = new Date()
+  return dateToString(date)
+}

src/views/modules/warehouse/in-record.vue

@@ -30,7 +30,7 @@
       </el-form-item>
       <el-form-item>
         <el-button @click="queryData()">查询</el-button>
-        <el-button v-if="false" @click="exportData()" type="primary">导出</el-button>
+        <el-button v-if="isAuth('wh:record:export')" @click="exportData()" type="primary">导出</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -160,7 +160,8 @@
 <script>
   import UserComponent from '../common/user-component'
   import { getRecordList } from '@/api/warehouse'
-  export default {
+  import { getFirstDayOfMonth, getCurrentDay } from '@/api/util'
+export default {
     name: 'stock-order',
     components: {UserComponent},
     created () {
@@ -172,7 +173,7 @@
         dataForm: {
           number: '',
           name: '',
-          date: ''
+          date: [getFirstDayOfMonth(), getCurrentDay()]
         },
         dataList: [],
         pageIndex: 1,
@@ -242,7 +243,13 @@
       },
       // 导出
       exportData () {
-        // todo
+        let params = {
+          'beginTime': this.dataForm.date ? this.dataForm.date[0] + ' 00:00:00' : null,
+          'endTime': this.dataForm.date ? this.dataForm.date[1] + ' 23:59:59' : null
+        }
+        let url = this.$http.adornUrl('/biz-service/inbound-record-ctl/exportExcel') +
+          '?beginTime=' + encodeURIComponent(params.beginTime) + '&endTime=' + encodeURIComponent(params.endTime)
+        window.open(url, '_blank')
       },
       // 申请单类型
       formatRecordType (row) {

src/views/modules/warehouse/stock.vue

@@ -8,7 +8,7 @@
           </el-form-item>
           <el-form-item>
             <el-button @click="getDataList()">查询</el-button>
-            <el-button v-if="isAuth('wh:stockmanagement:exported')" type="primary" @click="exportExcel()">导出Excel</el-button>
+<!--            <el-button v-if="isAuth('wh:stockmanagement:exported')" type="primary" @click="exportExcel()">导出Excel</el-button>-->
             <el-button v-if="isAuth('wh:stockmanagement:noteChangeConfig')" type="primary" @click="setNoticeChangeHandel()">库存更改通知设置</el-button>
           </el-form-item>
         </el-form>
@@ -145,7 +145,8 @@
   import StockDetails from './stock-details'
   import StockAddOrUpdate from './stock-add-or-update'
   import NoticeChangeSetting from './stock-notice-change-setting'
-  export default {
+  import Vue from 'vue'
+export default {
     name: 'stock',
     components: {
       StockAddOrUpdate,
@@ -200,15 +201,18 @@
         })
       },
       exportExcel () {
+        let url = this.$http.adornUrl('/biz-service/stock-mg-ctl/exportedExcel')
         this.$http({
-          url: this.$http.adornUrl('/biz-service/stock-mg-ctl/exportedExcel'),
+          url: url,
           method: 'get',
           params: this.$http.adornParams({
             'materialName': this.dataForm.materialName
           })
         }).then(({data}) => {
-          if (data && data.code !== '200') {
+          if (data && data.code && data.code !== '200') {
             this.$message.error(data.msg || '系统错误，请联系管理员')
+          } else {
+            window.open(url + '?_token=' + Vue.cookie.get('token') + '?materialName=' + this.dataForm.materialName, '_blank')
           }
         })
       },