lilei 2 jaren geleden
bovenliggende
commit
60bcc3f9d5

+ 3 - 6
src/views/financialManagement/collectionDetailStatic/invoiceModal.vue

@@ -20,12 +20,9 @@
         </a-form-model-item>
         <a-form-model-item label="开票日期:" prop="invoiceDate">
           <a-date-picker
-            show-time
             id="noticeEdit-releaseDate"
-            format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择开票时间"
-            :disabled-date="disabledDate"
-            :disabledTime="disabledDateTime"
+            format="YYYY-MM-DD"
+            placeholder="请选择开票日期"
             v-model="form.invoiceDate"/>
           <div style="color:#999">如果没有开票,则不填写即可</div>
         </a-form-model-item>
@@ -142,7 +139,7 @@ export default {
       const invoiceDate = moment(this.form.invoiceDate).format('YYYY-MM-DD')
       const ajax_form = {
         'bookDetailSn': this.form.bookDetailSn,
-        'invoiceDate': invoiceDate
+        'invoiceDate': this.form.invoiceDate ? invoiceDate : ''
       }
       _this.spinning = true
       updateDetailInvoiceDate(ajax_form).then(res => {

+ 16 - 2
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -10,12 +10,12 @@
                 <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="收款单号">
                 <a-input id="collectionDetail-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="申请人">
                 <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
@@ -91,6 +91,16 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="开票日期">
+                  <a-date-picker
+                    id="collectionDetail-releaseDate"
+                    style="width:100%"
+                    format="YYYY-MM-DD"
+                    placeholder="请选择开票日期"
+                    v-model="queryParam.invoiceDate"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="所属区域">
                   <subarea id="collectionDetail-subarea" v-model="queryParam.subareaSn"></subarea>
@@ -174,6 +184,7 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import getDate from '@/libs/getDate.js'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -211,6 +222,7 @@ export default {
         subareaSn: undefined,
         provinceSn: undefined,
         invoiceDateType: undefined,
+        invoiceDate: '',
         payerType: undefined
       },
       invoiceIsShow: false,
@@ -228,6 +240,7 @@ export default {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
+        params.invoiceDate = params.invoiceDate ? moment(params.invoiceDate).format('YYYY-MM-DD') : ''
         return financeBookDetailQueryPage(params).then(res => {
           let data
           if (res.status == 200) {
@@ -359,6 +372,7 @@ export default {
       this.queryParam.subareaSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.invoiceDateType = undefined
+      this.queryParam.invoiceDate = ''
       this.queryParam.payerType = undefined
       this.$refs.table.refresh(true)
     },