lilei 3 tahun lalu
induk
melakukan
e5055bdb1d
2 mengubah file dengan 25 tambahan dan 18 penghapusan
  1. 23 17
      pages/sales/list.vue
  2. 2 1
      pages/sales/salesSearch.vue

+ 23 - 17
pages/sales/list.vue

@@ -72,25 +72,31 @@
 				if(this.searchForm.financialStatus){
 					data.financialStatus = this.searchForm.financialStatus
 				}
-				if(params.beginDate){
-					data.beginDate = params.beginDate
-				}
-				if(params.endDate){
-					data.endDate = params.endDate
-				}
-				if(params.buyerName){
-					data.buyerName = params.buyerName
-				}
-				if(params.salesBillNo){
-					data.salesBillNo = params.salesBillNo
-				}
-				if(params.purchaseBillNo){
-					data.purchaseBillNo = params.purchaseBillNo
-				}
-				if(params.settleStyleSn){
-					data.settleStyleSn = params.settleStyleSn
+				
+				if(params){
+					if(params.beginDate){
+						data.beginDate = params.beginDate
+					}
+					if(params.endDate){
+						data.endDate = params.endDate
+					}
+					if(params.buyerName){
+						data.buyerName = params.buyerName
+					}
+					if(params.salesBillNo){
+						data.salesBillNo = params.salesBillNo
+					}
+					if(params.purchaseBillNo){
+						data.purchaseBillNo = params.purchaseBillNo
+					}
+					if(params.settleStyleSn){
+						data.settleStyleSn = params.settleStyleSn
+					}
 				}
+				
 				this.searchParams = data
+				this.searchParams.beginDate = data.beginDate ? (data.beginDate + ' 00:00:00') : ''
+				this.searchParams.endDate = data.endDate ? (data.endDate + ' 59:59:59') : ''
 				console.log(this.searchParams,'this.searchParams')
 				this.$nextTick(function(){
 					_this.$refs.salesList.refash()

+ 2 - 1
pages/sales/salesSearch.vue

@@ -106,8 +106,9 @@
 				this.form.beginDate = ''
 				this.form.endDate = ''
 				this.$refs.uForm.resetFields()
-				this.$emit('refresh', {})
+				this.$emit('refresh', null)
 				this.isShow = false
+				this.clearTime()
 			},
 			//  清空收款方式
 			clearSettleStyle(){