Browse Source

Merge commit '9b25a5d0244cc59c0861e89311c45c5537828da1' into HEAD

gitadmin 2 years ago
parent
commit
da28ce7cf2

+ 3 - 3
package-lock.json

@@ -11523,9 +11523,9 @@
       }
     },
     "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
     },
     "move-concurrently": {
       "version": "1.0.1",

+ 4 - 2
package.json

@@ -24,7 +24,7 @@
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
     "mockjs2": "1.0.7",
-    "moment": "^2.24.0",
+    "moment": "^2.29.1",
     "nprogress": "^0.2.0",
     "screenfull": "^5.1.0",
     "v-runtime-template": "^1.10.0",
@@ -87,7 +87,9 @@
       "parser": "babel-eslint"
     },
     "rules": {
-       "eqeqeq":["off"],
+      "eqeqeq": [
+        "off"
+      ],
       "generator-star-spacing": "off",
       "no-mixed-operators": 0,
       "vue/max-attributes-per-line": [

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1672730138035
+  "version": 1674012487353
 }

+ 7 - 3
src/App.vue

@@ -8,14 +8,18 @@
 </template>
 
 <script>
-import zhCN from 'ant-design-vue/es/locale/zh_CN'
+import zhCN from 'ant-design-vue/es/locale/zh_CN';
 import { AppDeviceEnquire } from '@/utils/mixin'
+import moment from 'moment';//引入moment 
+import 'moment/locale/zh-cn';
+moment.locale('zh-cn'); //设置语言 或 moment.lang('zh-cn'); 
 export default {
   mixins: [AppDeviceEnquire],
   data () {
     return {
-      locale: zhCN,
-      envtips: ''
+      locale:zhCN,
+      envtips: '',
+      moment
     }
   },
   created () {

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
       />
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '30px 20px 0', paddingTop: multiTab&&fixedHeader ? '66px' : (!multiTab&&fixedHeader?'45px':'0') }">
+      <a-layout-content :class="navTheme" :style="{ height: '100%', margin: '30px 20px 0', paddingTop: multiTab&&fixedHeader ? '66px' : (!multiTab&&fixedHeader?'45px':'0') }">
         <transition name="page-transition">
           <!-- <route-view v-if="isRouterAlive"/> -->
           <router-view ></router-view>

+ 1 - 1
src/libs/getDate.js

@@ -1,6 +1,6 @@
 // 引入 moment 时间插件
 import moment from 'moment'
-moment.updateLocale('en', { week: {
+moment.updateLocale('zh-cn', { week: {
   dow: 1, // 星期的第一天是星期一
   doy: 7 // 年份的第一周必须包含1月1日 (7 + 1 - 1)
 } })

+ 2 - 8
src/main.js

@@ -8,14 +8,8 @@ import { VueAxios } from './utils/request'
 import Viewer from 'v-viewer'
 import 'viewerjs/dist/viewer.css'
 
-import LocaleProvider from 'ant-design-vue'
-Vue.use(LocaleProvider)
-
-// moment
-import moment from 'moment'; 
-import 'moment/locale/zh-cn';
-moment.locale('zh-cn'); //设置语言 或 moment.lang('zh-cn'); 
-Vue.prototype.$moment = moment;//挂载到当前vue实例对象
+import { ConfigProvider } from 'ant-design-vue'
+Vue.use(ConfigProvider)
 
 // mock
 // import './mock'

+ 2 - 2
src/views/allocationManagement/chainTransferOut/list.vue

@@ -12,12 +12,12 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="审核时间">
-                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+                <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="出库时间">
-                <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+                <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
             <template v-if="advanced">

+ 156 - 56
src/views/common/rangeDate.vue

@@ -1,18 +1,57 @@
 <template>
-  <a-range-picker
-    style="width:100%"
-    :ranges="ranges"
-    :value="date"
-    :size="size"
-    :disabledDate="disabledDate"
-    :format="dateFormat"
-    :allowClear="allowClear"
-    @change="dateChange"
-    @calendarChange="dateCalendarChange"
-    :placeholder="['开始时间', '结束时间']" />
+  <div style="display: flex;align-items: center;">
+    <a-date-picker
+      :size="size"
+      :locale="locale"
+      v-model="startValue"
+      :allowClear="allowClear"
+      :disabled-date="disabledStartDate"
+      :show-time="showTime"
+      :format="showTime?'YYYY-MM-DD hh:mm:ss':'YYYY-MM-DD'"
+      placeholder="开始时间"
+      :open="startOpen"
+      inputReadOnly
+      @openChange="handleStartOpenChange"
+      @panelChange="handleStartPanelChange"
+      :showToday="false"
+    >
+      <div slot="renderExtraFooter">
+        <a-button @click="setVal('date1')" type="link" size="small">今天</a-button>
+        <a-button @click="setVal('date2')" type="link" size="small">近一个月</a-button>
+        <a-button @click="setVal('date3')" type="link" size="small">本月</a-button>
+        <a-button @click="setVal('date4')" type="link" size="small">上月</a-button>
+        <a-button @click="setVal('date5')" type="link" size="small">近一年</a-button>
+      </div>
+    </a-date-picker>
+    <span>&nbsp;&nbsp;至&nbsp;&nbsp;</span>
+    <a-date-picker
+      :size="size"
+      :locale="locale"
+      v-model="endValue"
+      :allowClear="allowClear"
+      :disabled-date="disabledEndDate"
+      :show-time="showTime"
+      :format="showTime?'YYYY-MM-DD hh:mm:ss':'YYYY-MM-DD'"
+      placeholder="结束时间"
+      inputReadOnly
+      :open="endOpen"
+      @openChange="handleEndOpenChange"
+      @panelChange="handleEndPanelChange"
+      :showToday="false"
+    >
+      <div slot="renderExtraFooter">
+        <a-button @click="setVal('date1')" type="link" size="small">今天</a-button>
+        <a-button @click="setVal('date2')" type="link" size="small">近一个月</a-button>
+        <a-button @click="setVal('date3')" type="link" size="small">本月</a-button>
+        <a-button @click="setVal('date4')" type="link" size="small">上月</a-button>
+        <a-button @click="setVal('date5')" type="link" size="small">近一年</a-button>
+      </div>
+    </a-date-picker>
+  </div>
 </template>
 <script>
-import moment from 'moment'
+import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+import moment from 'moment';//引入moment 
 export default {
   props: {
     value: {
@@ -27,74 +66,135 @@ export default {
     },
     showTime: {
       type: Boolean,
-      default: true
+      default: false
     },
     allowClear: {
       type: Boolean,
       default: true
-    },
-    hasDisabledAreaTime: {
-      type: Boolean,
-      default: true
     }
   },
   data () {
     return {
-      date: this.value,
-      dateFormat: 'YYYY-MM-DD',
-      selectPriceDate: '',
+      locale,
+      startValue: null,
+      endValue: null,
+      endOpen: false,
+      startOpen: false,
       ranges: {
-        '今天': [moment(), moment()],
-        '近一个月': [moment().subtract(1, 'months'), moment()],
-        '本月': [moment().startOf('month'), moment()],
-        '上月': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')],
-        '近一年': [moment().subtract(1, 'years'), moment()]
+        'date1': [moment(), moment()],
+        'date2': [moment().subtract(1, 'months'), moment()],
+        'date3': [moment().startOf('month'), moment()],
+        'date4': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')],
+        'date5': [moment().subtract(1, 'years'), moment()]
+      },
+      startMode:'',
+      endMode: ''
+    }
+  },
+  watch: {
+    startValue (val,old) {
+      if(old&&!val){
+        this.endValue = null
+      }
+      if(val && !this.endValue){
+        this.endOpen = true
       }
+      this.startValue = val || null
+      this.changeInput()
+    },
+    endValue (val,old) {
+      if(old&&!val){
+        this.startValue = null
+      }
+      this.endValue = val || null
+      this.changeInput()
     }
   },
   methods: {
-    // 不可选日期
-    disabledDate (current) {
-      //  最早可倒推选择两年数据,最晚为今天
-      const minYearVs = moment().subtract(2, 'years') //  两年前   负值
+    setVal (key) {
+      this.startValue = this.ranges[key][0]
+      this.endValue = this.ranges[key][1]
+      this.startOpen = false
+      this.endOpen = false
+    },
+    disabledStartDate (startValue) {
+      const endValue = this.endValue
+      const maxYearVs = moment().endOf('day') //  今天,包含今天
+      if (endValue) {
+        if (!this.startValue) {
+          return startValue.valueOf() > moment(endValue, 'YYYY-MM-DD').add(1, 'days').valueOf() || startValue.valueOf() > maxYearVs.valueOf()
+        }
+        if(this.startMode == 'year'){
+          return startValue.valueOf() > moment().endOf('year').valueOf()
+        }
+        if(this.startMode == 'month'){
+          return startValue.valueOf() > moment().endOf('month').valueOf()
+        }
+        return startValue.valueOf() > moment(endValue).valueOf() || startValue.valueOf() > maxYearVs.valueOf()
+      }
+      return startValue.valueOf() > maxYearVs.valueOf()
+    },
+    disabledEndDate (endValue) {
+      const startValue = this.startValue
       const maxYearVs = moment().endOf('day') //  今天,包含今天
-
-      if (!this.hasDisabledAreaTime) {
-        return current && current > maxYearVs
+      if (startValue) {
+        if(this.endMode == 'year'){
+          const sv = moment(startValue).startOf('year')
+          return endValue.valueOf() < sv.valueOf() || endValue.valueOf() > moment().endOf('year').valueOf()
+        }
+        if(this.endMode == 'month'){
+          const sv = moment(startValue).startOf('month')
+          return endValue.valueOf() < sv.valueOf() || endValue.valueOf() > moment().endOf('month').valueOf()
+        }
+        return moment(startValue).valueOf() > endValue.valueOf() || endValue.valueOf() > maxYearVs.valueOf()
       }
-      console.log(this.selectPriceDate)
-      //  限制最多只能查一年区间的数据
-      if (this.selectPriceDate) {
-        const oMinYearVs = moment(this.selectPriceDate, 'YYYY-MM-DD').subtract(1, 'years') //  当前选中开始日期前推一年
-        const oMaxYearVs = moment(this.selectPriceDate, 'YYYY-MM-DD').add(1, 'years') //  当前选中开始日期后推一年
-        // 判断两个时间段是否相差m天  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
-        const beginDate = minYearVs.diff(oMinYearVs, 'days') > 0 ? minYearVs : oMinYearVs // 若当前选中开始日期前推一年超出最多倒推两年数据时,则以两年为标准
-        const endDate = maxYearVs.diff(oMaxYearVs, 'days') > 0 ? oMaxYearVs : maxYearVs // 若当前选中开始日期后推一年超出今天时,则以今天为标准
-        return current && current < beginDate || current && current > endDate
-      } else {
-        return current && current > maxYearVs || current && current < minYearVs
+      return endValue.valueOf() > maxYearVs.valueOf()
+    },
+    handleStartOpenChange (open) {
+      if(!open && !this.endValue){
+        this.endOpen = !!this.startValue
       }
+      if(!open){
+        this.startMode = ''
+      }
+      this.startOpen = open
+    },
+    handleEndOpenChange (open) {
+      if(!open){
+        this.endMode = ''
+      }
+      this.endOpen = open
     },
-    // 日期  change
-    dateChange (date, dateStrings) {
-      this.selectPriceDate = ''
-      this.date = date
-      if (dateStrings[0] == '' && dateStrings[1] == '') {
+    handleStartPanelChange (v, mode) {
+      console.log(v, mode)
+      this.startMode = mode
+    },
+    handleEndPanelChange (v, mode) {
+      console.log(v, mode)
+      this.endMode = mode
+    },
+    changeInput () {
+      const startValue = this.startValue
+      const endValue = this.endValue
+      console.log(startValue, endValue)
+      let dateStrings = [startValue, endValue]
+      if (!dateStrings[0] && !dateStrings[1]) {
         dateStrings = []
       } else {
-        if (this.showTime) {
-          dateStrings[0] = dateStrings[0] + ' 00:00:00'
-          dateStrings[1] = dateStrings[1] + ' 23:59:59'
+        if (!this.showTime) {
+          dateStrings[0] = dateStrings[0] ? moment(dateStrings[0]).format('YYYY-MM-DD 00:00:00') : ''
+          dateStrings[1] = dateStrings[1] ? moment(dateStrings[1]).format('YYYY-MM-DD 23:59:59') : ''
+        } else {
+          dateStrings[0] = dateStrings[0] ? moment(dateStrings[0]).format('YYYY-MM-DD hh:mm:ss') : ''
+          dateStrings[1] = dateStrings[1] ? moment(dateStrings[1]).format('YYYY-MM-DD hh:mm:ss') : ''
         }
       }
       this.$emit('change', dateStrings)
     },
-    dateCalendarChange (date, dateStrings) {
-      this.selectPriceDate = date[0]
-    },
     resetDate (val) {
-      this.date = val || []
-      this.$emit('change', this.date)
+      this.startValue = val && val[0] ? val[0] : null
+      this.endValue = val && val[1] ? val[1] : null
+      this.$emit('change', [])
     }
   }
 }

+ 101 - 0
src/views/common/rangeDateOld.vue

@@ -0,0 +1,101 @@
+<template>
+  <a-range-picker
+    style="width:100%"
+    :ranges="ranges"
+    :value="date"
+    :size="size"
+    :disabledDate="disabledDate"
+    :format="dateFormat"
+    :allowClear="allowClear"
+    @change="dateChange"
+    @calendarChange="dateCalendarChange"
+    :placeholder="['开始时间', '结束时间']" />
+</template>
+<script>
+import moment from 'moment'
+export default {
+  props: {
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    size: {
+      type: String,
+      default: 'default'
+    },
+    showTime: {
+      type: Boolean,
+      default: true
+    },
+    allowClear: {
+      type: Boolean,
+      default: true
+    },
+    hasDisabledAreaTime: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      date: this.value,
+      dateFormat: 'YYYY-MM-DD',
+      selectPriceDate: '',
+      ranges: {
+        '今天': [moment(), moment()],
+        '近一个月': [moment().subtract(1, 'months'), moment()],
+        '本月': [moment().startOf('month'), moment()],
+        '上月': [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')],
+        '近一年': [moment().subtract(1, 'years'), moment()]
+      }
+    }
+  },
+  methods: {
+    // 不可选日期
+    disabledDate (current) {
+      //  最早可倒推选择两年数据,最晚为今天
+      const minYearVs = moment().subtract(2, 'years') //  两年前   负值
+      const maxYearVs = moment().endOf('day') //  今天,包含今天
+
+      if (!this.hasDisabledAreaTime) {
+        return current && current > maxYearVs
+      }
+      console.log(this.selectPriceDate)
+      //  限制最多只能查一年区间的数据
+      if (this.selectPriceDate) {
+        const oMinYearVs = moment(this.selectPriceDate, 'YYYY-MM-DD').subtract(1, 'years') //  当前选中开始日期前推一年
+        const oMaxYearVs = moment(this.selectPriceDate, 'YYYY-MM-DD').add(1, 'years') //  当前选中开始日期后推一年
+        // 判断两个时间段是否相差m天  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
+        const beginDate = minYearVs.diff(oMinYearVs, 'days') > 0 ? minYearVs : oMinYearVs // 若当前选中开始日期前推一年超出最多倒推两年数据时,则以两年为标准
+        const endDate = maxYearVs.diff(oMaxYearVs, 'days') > 0 ? oMaxYearVs : maxYearVs // 若当前选中开始日期后推一年超出今天时,则以今天为标准
+        return current && current < beginDate || current && current > endDate
+      } else {
+        return current && current > maxYearVs || current && current < minYearVs
+      }
+    },
+    // 日期  change
+    dateChange (date, dateStrings) {
+      this.selectPriceDate = ''
+      this.date = date
+      if (dateStrings[0] == '' && dateStrings[1] == '') {
+        dateStrings = []
+      } else {
+        if (this.showTime) {
+          dateStrings[0] = dateStrings[0] + ' 00:00:00'
+          dateStrings[1] = dateStrings[1] + ' 23:59:59'
+        }
+      }
+      this.$emit('change', dateStrings)
+    },
+    dateCalendarChange (date, dateStrings) {
+      this.selectPriceDate = date[0]
+    },
+    resetDate (val) {
+      this.date = val || []
+      this.$emit('change', this.date)
+    }
+  }
+}
+</script>

+ 0 - 107
src/views/common/rangeDateTime.vue

@@ -1,107 +0,0 @@
-<template>
-  <div style="display: flex;align-items: center;">
-    <a-date-picker
-      :size="size"
-      v-model="startValue"
-      :disabled-date="disabledStartDate"
-      :show-time="false"
-      format="YYYY-MM-DD"
-      placeholder="开始时间"
-      @openChange="handleStartOpenChange"
-    />
-    <span>&nbsp;&nbsp;至&nbsp;&nbsp;</span>
-    <a-date-picker
-      :size="size"
-      v-model="endValue"
-      :disabled-date="disabledEndDate"
-      :show-time="false"
-      format="YYYY-MM-DD"
-      placeholder="结束时间"
-      :open="endOpen"
-      @openChange="handleEndOpenChange"
-    />
-  </div>
-</template>
-<script>
-import moment from 'moment'
-export default {
-  props: {
-    value: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    size: {
-      type: String,
-      default: 'default'
-    },
-    showTime: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data () {
-    return {
-      startValue: this.value[0],
-      endValue: this.value[1],
-      endOpen: false
-    }
-  },
-  watch: {
-    startValue (val) {
-      this.changeInput()
-    },
-    endValue (val) {
-      this.changeInput()
-    }
-  },
-  methods: {
-    disabledStartDate (startValue) {
-      const endValue = this.endValue
-      const oMinYearVs = moment(endValue, 'YYYY-MM-DD').subtract(1, 'years')
-      const maxYearVs = moment().endOf('day') //  今天,包含今天
-      if (endValue) {
-        return startValue.valueOf() < oMinYearVs.valueOf() || startValue.valueOf() > maxYearVs.valueOf()
-      } else {
-        return startValue.valueOf() > maxYearVs.valueOf()
-      }
-    },
-    disabledEndDate (endValue) {
-      const maxYearVs = moment().endOf('day') //  今天,包含今天
-      return endValue && endValue.valueOf() > maxYearVs.valueOf()
-    },
-    handleStartOpenChange (open) {
-      if (!open) {
-        this.endOpen = true
-      }
-    },
-    handleEndOpenChange (open) {
-      this.endOpen = open
-    },
-    changeInput () {
-      const startValue = this.startValue
-      const endValue = this.endValue
-      console.log(startValue, endValue)
-      let dateStrings = [startValue, endValue]
-      if (!dateStrings[0] || !dateStrings[1]) {
-        dateStrings = []
-      } else {
-        if (this.showTime) {
-          dateStrings[0] = moment(dateStrings[0]).format('YYYY-MM-DD 00:00:00')
-          dateStrings[1] = moment(dateStrings[1]).format('YYYY-MM-DD 23:59:59')
-        } else {
-          dateStrings[0] = moment(dateStrings[0]).format('YYYY-MM-DD')
-          dateStrings[1] = moment(dateStrings[1]).format('YYYY-MM-DD')
-        }
-      }
-      this.$emit('change', dateStrings)
-    },
-    resetDate (val) {
-      this.startValue = val && val[0] || ''
-      this.endValue = val && val[1] || ''
-      this.$emit('change', [])
-    }
-  }
-}
-</script>

+ 3 - 3
src/views/financialManagement/expenseManagement/list.vue

@@ -5,7 +5,7 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="费用单号">
                 <a-input id="expenseManagementList-accountExpensesNo" v-model.trim="queryParam.accountExpensesNo" allowClear placeholder="请输入费用单号"/>
               </a-form-item>
@@ -15,7 +15,7 @@
                 <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="费用类型">
                 <a-cascader
                   @change="changeCostType"
@@ -30,7 +30,7 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="单据状态">
                   <v-select
                     v-model="queryParam.state"

+ 3 - 3
src/views/financialManagement/ledgerRecord/list.vue

@@ -14,19 +14,19 @@
               <custSatelliteList ref="custSatelliteList" @change="custSatelliteChange"></custSatelliteList>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-item label="产品名称">
               <a-input id="ledgerRecordList-name" v-model.trim="queryParam.dealerProduct.name" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="产品编码">
                 <a-input id="ledgerRecordList-code" v-model.trim="queryParam.dealerProduct.code" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="ledgerRecordList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="ledgerRecordList-reset">重置</a-button>

+ 3 - 3
src/views/financialManagement/withdrawalManagement/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="提现时间">
-                <rangeDateTime ref="rangeDate" @change="dateChange" />
+                <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -56,12 +56,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import cashOutModal from './cashOutModal.vue'
 import { satelliteWHWithdrawalList, satelliteWHWithdrawalAccount } from '@/api/satelliteWH'
 export default {
   name: 'SatelliteWHWithdrawalList',
-  components: { STable, VSelect, rangeDateTime, cashOutModal },
+  components: { STable, VSelect, rangeDate, cashOutModal },
   mixins: [commonMixin],
   data () {
     return {

+ 6 - 8
src/views/numsGoodsShelves/accountManagement/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="交易时间">
-                <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="dateChange"/>
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="6">
@@ -42,11 +42,12 @@
 import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { queryTradeFlowPage, merchantCashOutDetail } from '@/api/merchant'
 import { toThousands } from '@/libs/tools.js'
 export default {
   mixins: [commonMixin],
-  components: { STable },
+  components: { STable, rangeDate },
   data () {
     return {
       toThousands,
@@ -99,12 +100,8 @@ export default {
     // 时间改变
     dateChange (date) {
       console.log(date, 'date')
-      this.queryParam.beginDate = moment(date[0]).format('YYYY-MM-DD')
-      this.queryParam.endDate = moment(date[1]).format('YYYY-MM-DD')
-    },
-    // 禁止选择今天之后的日期
-    disabledDate (current) {
-      return current && current > moment().endOf('day')
+      this.queryParam.beginDate = date[0] ? moment(date[0]).format('YYYY-MM-DD') : ''
+      this.queryParam.endDate = date[1] ? moment(date[1]).format('YYYY-MM-DD') : ''
     },
     getPageInfo () {
       merchantCashOutDetail({}).then(res => {
@@ -120,6 +117,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.time = []
+      this.$refs.rangeDate.resetDate(this.time)
       this.$refs.table.refresh(true)
     },
     // 申请提现

+ 6 - 4
src/views/numsGoodsShelves/settlementManagement/settlementDetail.vue

@@ -13,7 +13,7 @@
             <a-row :gutter="15">
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
                 <a-form-item label="结算时间">
-                  <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="dateChange"/>
+                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
@@ -63,11 +63,12 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import detailModal from './detailModal.vue'
 import moment from 'moment'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { querySettleBillPage } from '@/api/merchant'
 import { toThousands } from '@/libs/tools.js'
 export default {
   mixins: [commonMixin],
-  components: { STable, VSelect, detailModal },
+  components: { STable, VSelect, detailModal, rangeDate },
   data () {
     return {
       spinning: false,
@@ -120,8 +121,8 @@ export default {
       this.$router.push({ path: '/numsGoodsShelves/settlementManagement/list' })
     },
     dateChange (date) {
-	  this.queryParam.beginDate = moment(date[0]).format('YYYY-MM-DD')
-	  this.queryParam.endDate = moment(date[1]).format('YYYY-MM-DD')
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
     },
     disabledDate (current) {
 	  return current && current > moment().endOf('day')
@@ -134,6 +135,7 @@ export default {
         endDate: '',
         payWay: undefined
       }
+      this.$refs.rangeDate.resetDate(this.time)
       this.$refs.table.refresh(true)
     },
     // 查看详情

+ 10 - 10
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -44,12 +44,12 @@
             <a-row :gutter="15">
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
                 <a-form-item label="下单时间">
-                  <a-range-picker v-model="orderDate" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="orderDateChange"/>
+                  <rangeDate ref="orderDate" :value="orderDate" @change="orderDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
                 <a-form-item label="取货时间">
-                  <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="dateChange"/>
+                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
                 </a-form-item>
               </a-col>
               <a-col :xl="6" :lg="6" :md="12" :sm="24">
@@ -92,10 +92,11 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { toThousands } from '@/libs/tools.js'
 import moment from 'moment'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOut } from '@/api/merchant'
 export default {
   mixins: [commonMixin],
-  components: { STable, VSelect, commonMixin },
+  components: { STable, VSelect, commonMixin, rangeDate },
   data () {
     return {
       toThousands,
@@ -165,16 +166,13 @@ export default {
     orderDateChange (date) {
       console.log(date, date)
       this.orderDate = date
-      this.queryParam.orderBeginDate = moment(date[0]).format('YYYY-MM-DD')
-      this.queryParam.orderEndDat = moment(date[1]).format('YYYY-MM-DD')
+      this.queryParam.orderBeginDate = date[0] || ''
+      this.queryParam.orderEndDat = date[1] || ''
     },
     dateChange (date) {
       this.time = date
-      this.queryParam.outBeginDate = moment(date[0]).format('YYYY-MM-DD')
-      this.queryParam.outEndDate = moment(date[1]).format('YYYY-MM-DD')
-    },
-    disabledDate (current) {
-      return current && current > moment().endOf('day')
+      this.queryParam.outBeginDate = date[0] ? moment(date[0]).format('YYYY-MM-DD') : ''
+      this.queryParam.outEndDate = date[1] ? moment(date[1]).format('YYYY-MM-DD') : ''
     },
     getPageInfo () {
       this.spinning = true
@@ -210,6 +208,8 @@ export default {
         outEndDate: '',
         orderBillNo: ''
       }
+      this.$refs.rangeDate.resetDate(this.time)
+      this.$refs.orderDate.resetDate(this.orderDate)
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 6 - 9
src/views/numsGoodsShelves/withdrawalManagement/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :xl="6" :lg="6" :md="12" :sm="24">
               <a-form-item label="交易时间">
-                <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="dateChange"/>
+                <rangeDate ref="rangeDate" v-model="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="6" :md="6" :sm="6">
@@ -49,11 +49,12 @@ import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import { STable } from '@/components'
 import applyWithdrawal from './applyWithdrawal.vue'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { queryMerchantCashOutPage, merchantCashOutDetail } from '@/api/merchant'
 import { toThousands } from '@/libs/tools.js'
 export default {
   mixins: [commonMixin],
-  components: { STable, applyWithdrawal },
+  components: { STable, applyWithdrawal, rangeDate },
   data () {
     return {
       toThousands,
@@ -106,13 +107,8 @@ export default {
   methods: {
     // 时间改变
     dateChange (date) {
-      console.log(date, 'date')
-      this.queryParam.beginDate = moment(date[0]).format('YYYY-MM-DD')
-      this.queryParam.endDate = moment(date[1]).format('YYYY-MM-DD')
-    },
-    // 禁止选择今天之后的日期
-    disabledDate (current) {
-      return current && current > moment().endOf('day')
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
     getPageInfo () {
       merchantCashOutDetail({}).then(res => {
@@ -132,6 +128,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.time = []
+      this.$refs.rangeDate.resetDate(this.time)
       this.$refs.table.refresh(true)
     },
     // 申请提现