完善时间查看

module/Purchase/src/Repository/OrderReturnRepository.php

@@ -47,8 +47,8 @@ class OrderReturnRepository extends EntityRepository
         if(isset($search['supplier_phone']) && !empty($search['supplier_phone']))       $queryBuilder->andWhere($queryBuilder->expr()->like('p.supplierPhone', "'%".$search['supplier_phone']."%'"));
         if(isset($search['supplier_id']) && $search['supplier_id'] > 0)                 $queryBuilder->andWhere($queryBuilder->expr()->eq('p.supplierId', $search['supplier_id']));
         if(isset($search['return_state']) && !empty($search['return_state']))         $queryBuilder->andWhere($queryBuilder->expr()->eq('o.returnState', $search['return_state']));
-        if(isset($search['start_time']) && !empty($search['start_time']))               $queryBuilder->andWhere($queryBuilder->expr()->gte('o.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
-        if(isset($search['end_time']) && !empty($search['end_time']))                   $queryBuilder->andWhere($queryBuilder->expr()->lte('o.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
+        if(isset($search['start_time']) && !empty($search['start_time']))               $queryBuilder->andWhere($queryBuilder->expr()->gte('o.returnTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
+        if(isset($search['end_time']) && !empty($search['end_time']))                   $queryBuilder->andWhere($queryBuilder->expr()->lte('o.returnTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
 
         return $queryBuilder;
     }

module/Purchase/view/purchase/order-return/index.phtml

@@ -122,4 +122,8 @@
         </div>
 
     </section>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    laydate.render({elem: '#start_time'});
+    laydate.render({elem: '#end_time'});
+</script>
\ No newline at end of file

module/Purchase/view/purchase/order-return/view.phtml

@@ -65,7 +65,7 @@
                         <div class="row">
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('采购退货时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->returnInfo->getreturnTime());?>
+                                    <b><?php echo $this->translate('退货时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->returnInfo->getReturnFinishTime());?>
                                 </div>
                             </div>
                             <div class="col-xs-8 form-group">

module/Purchase/view/purchase/warehouse-order/index.phtml

@@ -128,4 +128,8 @@
         </div>
 
     </section>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    laydate.render({elem: '#start_time'});
+    laydate.render({elem: '#end_time'});
+</script>
\ No newline at end of file

module/Purchase/view/purchase/warehouse-order/view.phtml

@@ -93,7 +93,7 @@
                         <div class="row">
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('采购入库时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
+                                    <b><?php echo $this->translate('入库时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
                                 </div>
                             </div>
                             <div class="col-xs-8 form-group">

module/Sales/view/sales/sales-order-return/index.phtml

@@ -128,4 +128,8 @@
         </div>
 
     </section>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    laydate.render({elem: '#start_time'});
+    laydate.render({elem: '#end_time'});
+</script>
\ No newline at end of file

module/Sales/view/sales/sales-order-return/view.phtml

@@ -77,7 +77,7 @@
                             </div>
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('退货时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->returnInfo->getreturnTime());?>
+                                    <b><?php echo $this->translate('退货时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->returnInfo->getReturnFinishTime());?>
                                 </div>
                             </div>
                             <div class="col-xs-4 form-group">

module/Sales/view/sales/sales-order/index.phtml

@@ -149,4 +149,8 @@
         </div>
 
     </section>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    laydate.render({elem: '#start_time'});
+    laydate.render({elem: '#end_time'});
+</script>
\ No newline at end of file

module/Sales/view/sales/sales-send-order/index.phtml

@@ -134,4 +134,8 @@
         </div>
 
     </section>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+    laydate.render({elem: '#start_time'});
+    laydate.render({elem: '#end_time'});
+</script>
\ No newline at end of file