Browse Source

bug修复

lilei 2 years ago
parent
commit
d8a8b55d62
2 changed files with 29 additions and 14 deletions
  1. 4 1
      src/App.vue
  2. 25 13
      src/views/financialManagement/collectionDetailStatic/list.vue

+ 4 - 1
src/App.vue

@@ -10,12 +10,15 @@
 <script>
 import zhCN from 'ant-design-vue/es/locale/zh_CN'
 import { AppDeviceEnquire } from '@/utils/mixin'
+import moment from 'moment'
+import 'moment/locale/zh-cn'
 export default {
   mixins: [AppDeviceEnquire],
   data () {
     return {
       locale: zhCN,
-      envtips: ''
+      envtips: '',
+      moment
     }
   },
   created () {

+ 25 - 13
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -91,14 +91,9 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="开票日期">
-                  <a-date-picker
-                    id="collectionDetail-releaseDate"
-                    style="width:100%"
-                    format="YYYY-MM-DD"
-                    placeholder="请选择开票日期"
-                    v-model="queryParam.invoiceDate"/>
+                  <rangeDate ref="invoiceDate" :value="invoiceDate" @change="invoiceDateChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
@@ -222,7 +217,8 @@ export default {
         subareaSn: undefined,
         provinceSn: undefined,
         invoiceDateType: undefined,
-        invoiceDate: '',
+        invoiceBeginDate: '',
+        invoiceEndDate: '',
         payerType: undefined
       },
       invoiceIsShow: false,
@@ -230,6 +226,7 @@ export default {
       printIsShow: false,
       disabled: false, //  查询、重置按钮是否可操作
       receiptDate: [], //  收款时间
+      invoiceDate: [], // 开票日期
       auditDate: [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
@@ -336,11 +333,16 @@ export default {
         this.queryParam.bankName = undefined
       }
     },
-    //  创建时间  change
+    //  收款日期  change
     receiptDateChange (date) {
       this.queryParam.receiptBeginDate = date[0] ? date[0] : ''
       this.queryParam.receiptEndDate = date[1] ? date[1] : ''
     },
+    //  开票时间  change
+    invoiceDateChange (date) {
+      this.queryParam.invoiceBeginDate = date[0] ? date[0] : ''
+      this.queryParam.invoiceEndDate = date[1] ? date[1] : ''
+    },
     //  审核时间  change
     dateAuditChange (date) {
       this.queryParam.auditBeginDate = date[0] ? date[0] : ''
@@ -348,10 +350,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.receiptDate = []
-      this.queryParam.receiptBeginDate = ''
-      this.queryParam.receiptEndDate = ''
-      this.$refs.receiptDate.resetDate(this.receiptDate)
+      // 审核日期
       this.auditDate = [
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
@@ -359,6 +358,19 @@ export default {
       this.$refs.rangeAuditDate.resetDate(this.auditDate)
       this.queryParam.auditBeginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.auditEndDate = getDate.getCurrMonthDays().endtime
+      // 收款日期
+      this.receiptDate = []
+      this.queryParam.receiptBeginDate = ''
+      this.queryParam.receiptEndDate = ''
+      this.$refs.receiptDate.resetDate(this.receiptDate)
+
+      // 开票日期
+      this.invoiceDate = []
+      this.queryParam.invoiceBeginDate = ''
+      this.queryParam.invoiceEndDate = ''
+      if (this.advanced) {
+        this.$refs.invoiceDate.resetDate(this.invoiceDate)
+      }
 
       this.queryParam.bookNo = ''
       this.queryParam.dispatchBillNo = ''