chenrui 3 năm trước cách đây
mục cha
commit
03f35481df

+ 8 - 8
src/views/financialManagement/warehousingAudit/list.vue

@@ -107,14 +107,14 @@ export default {
       advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       auditTime: [
-        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
-        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+        moment(getDate.getThreeMonthDays().starttime + ' 00:00:00', 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime + ' 23:59:59', 'YYYY-MM-DD')
       ], //  入库时间
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        beginDate: getDate.getThreeMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
+        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
         purchaseBillNo: '',
         receivingBillNo: '',
         auditState: 'WAIT_PUT_WAREHOUSE_AUDIT'
@@ -155,8 +155,8 @@ export default {
   methods: {
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
     },
     // 合计
     getTotal (param) {
@@ -198,8 +198,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.auditTime)
-      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime + ' 00:00:00'
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
       this.queryParam.purchaseBillNo = ''
       this.queryParam.receivingBillNo = ''
       this.queryParam.auditState = 'WAIT_PUT_WAREHOUSE_AUDIT'

+ 8 - 8
src/views/purchasingManagement/signWarehousing/list.vue

@@ -99,10 +99,10 @@ export default {
         getDate.getCurrMonthDays().endtime + ' 23:59:59'
       ],
       queryParam: { //  查询条件
-        // beginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
-        // endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
-        // purchaseBillNo: '', //  采购单号
-        // sendBillNo: '', //  备货单号
+        beginDate: getDate.getCurrMonthDays().starttime + ' 00:00:00',
+        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        purchaseBillNo: '', //  采购单号
+        sendBillNo: '', //  备货单号
         auditState: 'WAIT_PUT_WAREHOUSE_AUDIT'
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -144,10 +144,10 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
-      // this.queryParam.beginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
-      // this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
-      // this.queryParam.purchaseBillNo = ''
-      // this.queryParam.sendBillNo = ''
+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime + ' 00:00:00'
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.purchaseBillNo = ''
+      this.queryParam.sendBillNo = ''
       this.queryParam.auditState = 'WAIT_PUT_WAREHOUSE_AUDIT'
       this.$refs.table.refresh(true)
     },