浏览代码

日期少一天

DESKTOP-0GD05B0\Administrator 2 年之前
父节点
当前提交
fa718ca58d
共有 1 个文件被更改,包括 26 次插入22 次删除
  1. 26 22
      src/views/reports/ConsumablesStatistics.vue

+ 26 - 22
src/views/reports/ConsumablesStatistics.vue

@@ -1,7 +1,8 @@
 <template>
   <page-layer>
     <template #header>
-      <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :shortcuts="shortcuts"></el-date-picker>
+      <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+                      end-placeholder="结束日期" :shortcuts="shortcuts"></el-date-picker>
       <el-select v-model="queryTerm.classCode" filterable clearable placeholder="费用类型">
         <el-option v-for="item in classCode" :key="item.code" :label="item.name" :value="item.code">
           <span class="selectSpan">{{ item.code }}</span>
@@ -10,7 +11,8 @@
         </el-option>
       </el-select>
       名称搜索:
-      <el-select filterable remote clearable :remote-method="remoteMethod" v-model="queryTerm.projectCode" placeholder="拼音首字母搜索">
+      <el-select filterable remote clearable :remote-method="remoteMethod" v-model="queryTerm.projectCode"
+                 placeholder="拼音首字母搜索">
         <el-option v-for="item in shouFeiBianMaData" :key="item.code" :label="item.name" :value="item.code">
           <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
           <el-divider direction="vertical"></el-divider>
@@ -21,7 +23,8 @@
       <el-button type="primary" v-show="data.list.length" icon="Download" @click="excel">导出excel</el-button>
     </template>
     <template #main>
-      <el-table :data="data.list.slice((currentPage - 1) * pageSize, currentPage * pageSize)" :height="tableHeight" stripe highlight-current-row>
+      <el-table :data="data.list.slice((currentPage - 1) * pageSize, currentPage * pageSize)" :height="tableHeight"
+                stripe highlight-current-row>
         <el-table-column prop="projectCode" label="项目编码"></el-table-column>
         <el-table-column prop="entryName" show-overflow-tooltip label="项目名称"></el-table-column>
         <el-table-column prop="originBrand" label="产地品牌"></el-table-column>
@@ -53,21 +56,21 @@
 </template>
 
 <script>
-import { reactive, ref } from '@vue/reactivity'
-import { clockinShortcuts } from '@/data/shortcuts'
-import { getDropdownBox, queryConsumables } from '@/api/querydata/consumables-statistics'
-import { yaoPinHuoXiangMuCode, chaKanXiangQing } from '@/api/querydata/query-pay-service'
+import {reactive, ref} from '@vue/reactivity'
+import {clockinShortcuts} from '@/data/shortcuts'
+import {getDropdownBox, queryConsumables} from '@/api/querydata/consumables-statistics'
+import {yaoPinHuoXiangMuCode, chaKanXiangQing} from '@/api/querydata/query-pay-service'
 import store from '../../store'
-import { onMounted } from 'vue'
-import { shortcuts } from '@/data/shortcuts'
-import { formatDate } from '@/utils/date'
-import { downloadExcel } from '@/utils/excel'
-import { ElNotification } from 'element-plus'
+import {onMounted} from 'vue'
+import {shortcuts} from '@/data/shortcuts'
+import {formatDate, getDateRangeFormatDate} from '@/utils/date'
+import {downloadExcel} from '@/utils/excel'
+import {ElNotification} from 'element-plus'
 import yuanNeiTongJiCKXQ from './YuanNeiTongJiCKXQ.vue'
 import PageLayer from "@/layout/PageLayer";
 
 export default {
-  components: {PageLayer, yuanNeiTongJiCKXQ },
+  components: {PageLayer, yuanNeiTongJiCKXQ},
   name: 'consumablesStatistics',
   setup() {
     const windowSize = store.state.app.windowSize
@@ -116,8 +119,9 @@ export default {
 
     const query = () => {
       if (dateRange.value) {
-        queryTerm.startTime = formatDate(dateRange.value[0])
-        queryTerm.endTime = formatDate(dateRange.value[1])
+        let {startTime, endTime} = getDateRangeFormatDate(dateRange.value)
+        queryTerm.startTime = startTime
+        queryTerm.endTime = endTime
       } else if (queryTerm.classCode === '' && queryTerm.projectCode === '') {
         queryTerm.startTime = mrStart
         queryTerm.endTime = mrEnd
@@ -130,13 +134,13 @@ export default {
         queryTerm.endTime = ''
       }
       queryConsumables(queryTerm)
-        .then((res) => {
-          data.list = res
-          data.total = data.list.length
-        })
-        .catch(() => {
-          data.list = []
-        })
+          .then((res) => {
+            data.list = res
+            data.total = data.list.length
+          })
+          .catch(() => {
+            data.list = []
+          })
     }
 
     const excel = () => {