Browse Source

bug 修复

lilei 2 years ago
parent
commit
3f2be376e2

+ 6 - 5
src/views/salesManagement/receiptPrint/list.vue

@@ -40,7 +40,7 @@
                     <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
+                <a-col :md="4" :sm="24">
                   <a-form-item label="业务状态">
                     <v-select
                       v-model="queryParam.billStatus"
@@ -51,7 +51,7 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
+                <a-col :md="4" :sm="24" v-if="currentTab == 1">
                   <a-form-item label="单据状态">
                     <v-select
                       v-model="queryParam.voidFlag"
@@ -62,7 +62,7 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24" v-if="currentTab == 1">
+                <a-col :md="4" :sm="24" v-if="currentTab == 1">
                   <a-form-item label="收款打印状态">
                     <v-select
                       v-model="queryParam.printState"
@@ -74,12 +74,12 @@
                     ></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
+                <a-col :md="4" :sm="24">
                   <a-form-item label="所在区域">
                     <subarea id="salesCollectionList-subarea" v-model="queryParam.subareaSn"></subarea>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
+                <a-col :md="4" :sm="24">
                   <a-row>
                     <a-form-item label="地区">
                       <a-col span="24">
@@ -257,6 +257,7 @@ export default {
   methods: {
     changeTab (v) {
       this.currentTab = v
+      this.pageInit()
       this.resetSearchForm()
     },
     //  时间  change

+ 1 - 1
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -55,7 +55,7 @@
             <a-descriptions-item label="收款时间">
               {{ detail.settleTime || '--' }}
             </a-descriptions-item>
-            <a-descriptions-item v-if="detail.keepType != 'RELATION_BOOK'" label="收款人">
+            <a-descriptions-item label="收款人">
               {{ detail.settlePersonName || '--' }}
             </a-descriptions-item>
           </a-descriptions>

+ 2 - 2
src/views/salesManagement/stockPrint/list.vue

@@ -191,7 +191,7 @@ export default {
         billStatus: undefined, //  业务状态
         subareaSn: undefined,
         shippingAddrProvinceSn: undefined,
-        voidFlag: undefined,
+        voidFlag: 0,
         printStatus: 'NO_PRINT'
       },
       showTipModal: false,
@@ -309,7 +309,7 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
-      this.queryParam.voidFlag = undefined
+      this.queryParam.voidFlag = this.currentTab == 1 ? '' : '0'
       this.queryParam.printStatus = this.currentTab == 1 ? '' : 'NO_PRINT'
       this.$refs.table.refresh(true)
     },