Browse Source

bug 修复

lilei 3 years ago
parent
commit
1925b3a2bc
2 changed files with 9 additions and 6 deletions
  1. 6 4
      src/App.vue
  2. 3 2
      src/views/reportData/priceDifferenceDetailReport/list.vue

+ 6 - 4
src/App.vue

@@ -1,15 +1,17 @@
 <template>
 <template>
-  <a-locale-provider :locale="locale">
+  <a-config-provider :locale="locale">
     <div id="app">
     <div id="app">
       <router-view/>
       <router-view/>
     </div>
     </div>
-  </a-locale-provider>
+  </a-config-provider>
 </template>
 </template>
 
 
 <script>
 <script>
-import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
+import zhCN from 'ant-design-vue/es/locale/zh_CN'
 import { AppDeviceEnquire } from '@/utils/mixin'
 import { AppDeviceEnquire } from '@/utils/mixin'
-
+import moment from 'moment'
+import 'moment/locale/zh-cn'
+moment.locale('zh-cn')
 export default {
 export default {
   mixins: [AppDeviceEnquire],
   mixins: [AppDeviceEnquire],
   data () {
   data () {

+ 3 - 2
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -14,7 +14,7 @@
           <a-row :gutter="15">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="日期" prop="month">
               <a-form-model-item label="日期" prop="month">
-                <a-month-picker v-model="queryParam.month" @change="onChange" :defaultValue="null" style="width: 100%;" />
+                <a-month-picker v-model="queryParam.month" @change="onChange" :defaultValue="moment()" style="width: 100%;" />
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="5" :sm="24">
             <a-col :md="5" :sm="24">
@@ -94,11 +94,12 @@ export default {
   components: { STable, VSelect, custList },
   components: { STable, VSelect, custList },
   data () {
   data () {
     return {
     return {
+      moment,
       spinning: false,
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       advanced: false, // 高级搜索 展开/关闭
       exportLoading: false,
       exportLoading: false,
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        month: undefined,
+        month: moment(),
         provinceSn: undefined,
         provinceSn: undefined,
         rebateDealerSn: undefined,
         rebateDealerSn: undefined,
         dealerSn: undefined
         dealerSn: undefined