将采购订单下拉付款方式改为填写方式

module/Purchase/src/Controller/OrderController.php

@@ -73,7 +73,7 @@ class OrderController extends AbstractActionController
         $search = [];
         $searchForm = new SearchOrderForm();
         $searchForm->get('supplier_id')->setValueOptions($this->customerCommon()->supplierListOptions());
-        $searchForm->get('payment_code')->setValueOptions(Common::payment($this->translator));
+        //$searchForm->get('payment_code')->setValueOptions(Common::payment($this->translator));
         $searchForm->get('return_state')->setValueOptions(Common::existReturn($this->translator));
         $pOrderStateArray = Common::purchaseOrderState($this->translator);
         unset($pOrderStateArray[-5], $pOrderStateArray[-1]);
@@ -100,7 +100,7 @@ class OrderController extends AbstractActionController
     {
         $goodsForm  = new OrderGoodsForm($this->entityManager);
         $form       = new OrderForm($this->entityManager);
-        $form->get('paymentCode')->setValueOptions(Common::payment($this->translator));
+        //$form->get('paymentCode')->setValueOptions(Common::payment($this->translator));
         $form->get('supplierId')->setValueOptions($this->customerCommon()->supplierListOptions());
 
         if($this->getRequest()->isPost()) {
@@ -153,7 +153,7 @@ class OrderController extends AbstractActionController
         $goodsForm  = new OrderGoodsForm($this->entityManager);
         $form       = new OrderForm($this->entityManager, $orderInfo);
 
-        $form->get('paymentCode')->setValueOptions(Common::payment($this->translator));
+        //$form->get('paymentCode')->setValueOptions(Common::payment($this->translator));
         $form->get('supplierId')->setValueOptions($this->customerCommon()->supplierListOptions());
 
         if($this->getRequest()->isPost()) {

module/Purchase/src/Controller/WarehouseOrderController.php

@@ -68,7 +68,7 @@ class WarehouseOrderController extends AbstractActionController
         $search = [];
         $searchForm = new SearchWarehouseOrderForm();
         $searchForm->get('supplier_id')->setValueOptions($this->customerCommon()->supplierListOptions());
-        $searchForm->get('payment_code')->setValueOptions(Common::payment($this->translator));
+        //$searchForm->get('payment_code')->setValueOptions(Common::payment($this->translator));
         $pOrderStateArray = Common::purchaseOrderState($this->translator);
         $searchForm->get('p_order_state')->setValueOptions([2 => $pOrderStateArray[2], 3 => $pOrderStateArray[3]]);
         if($this->getRequest()->isGet()) {

module/Purchase/src/Form/OrderForm.php

@@ -49,7 +49,7 @@ class OrderForm extends Form
         ]);
 
         $this->add([
-            'type'  => 'select',
+            'type'  => 'text',
             'name'  => 'paymentCode',
             'attributes'    => [
                 'id'            => 'paymentCode',

module/Purchase/src/Form/SearchOrderForm.php

@@ -96,11 +96,12 @@ class SearchOrderForm extends Form
         ]);
 
         $this->add([
-            'type'  => 'select',
+            'type'  => 'text',
             'name'  => 'payment_code',
             'attributes'    => [
                 'id'            => 'payment_code',
-                'class'         => 'form-control input-sm'
+                'class'         => 'form-control input-sm',
+                'placeholder'   => $this->translator->translate('请输入付款方式')
             ]
         ]);
 

module/Purchase/src/Form/SearchWarehouseOrderForm.php

@@ -96,7 +96,7 @@ class SearchWarehouseOrderForm extends Form
         ]);
 
         $this->add([
-            'type'  => 'select',
+            'type'  => 'text',
             'name'  => 'payment_code',
             'attributes'    => [
                 'id'            => 'payment_code',

module/Purchase/src/Repository/OrderRepository.php

@@ -45,7 +45,8 @@ class OrderRepository extends EntityRepository
         if(isset($search['supplier_contacts']) && !empty($search['supplier_contacts'])) $queryBuilder->andWhere($queryBuilder->expr()->like('o.supplierContacts', "'%".$search['supplier_contacts']."%'"));
         if(isset($search['supplier_phone']) && !empty($search['supplier_phone']))       $queryBuilder->andWhere($queryBuilder->expr()->like('o.supplierPhone', "'%".$search['supplier_phone']."%'"));
         if(isset($search['supplier_id']) && $search['supplier_id'] > 0)                 $queryBuilder->andWhere($queryBuilder->expr()->eq('o.supplierId', $search['supplier_id']));
-        if(isset($search['payment_code']) && !empty($search['payment_code']))           $queryBuilder->andWhere($queryBuilder->expr()->eq('o.paymentCode', ':code'))->setParameter('code', $search['payment_code']);
+        if(isset($search['payment_code']) && !empty($search['payment_code']))           $queryBuilder->andWhere($queryBuilder->expr()->gte('o.paymentCode', $search['payment_code']));
+        /*if(isset($search['payment_code']) && !empty($search['payment_code']))           $queryBuilder->andWhere($queryBuilder->expr()->eq('o.paymentCode', ':code'))->setParameter('code', $search['payment_code']);*/
         if(isset($search['p_order_state']) && is_numeric($search['p_order_state']))     $queryBuilder->andWhere($queryBuilder->expr()->eq('o.pOrderState', $search['p_order_state']));
         if(isset($search['return_state']) && is_numeric($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']));

module/Purchase/src/Repository/WarehouseOrderRepository.php

@@ -46,7 +46,8 @@ class WarehouseOrderRepository extends EntityRepository
         if(isset($search['supplier_contacts']) && !empty($search['supplier_contacts'])) $queryBuilder->andWhere($queryBuilder->expr()->like('o.supplierContacts', "'%".$search['supplier_contacts']."%'"));
         if(isset($search['supplier_phone']) && !empty($search['supplier_phone']))       $queryBuilder->andWhere($queryBuilder->expr()->like('o.supplierPhone', "'%".$search['supplier_phone']."%'"));
         if(isset($search['supplier_id']) && $search['supplier_id'] > 0)                 $queryBuilder->andWhere($queryBuilder->expr()->eq('o.supplierId', $search['supplier_id']));
-        if(isset($search['payment_code']) && !empty($search['payment_code']))           $queryBuilder->andWhere($queryBuilder->expr()->eq('o.paymentCode', ':code'))->setParameter('code', $search['payment_code']);
+        if(isset($search['payment_code']) && !empty($search['payment_code']))           $queryBuilder->andWhere($queryBuilder->expr()->gte('w.paymentCode', $search['payment_code']));
+        //if(isset($search['payment_code']) && !empty($search['payment_code']))           $queryBuilder->andWhere($queryBuilder->expr()->eq('o.paymentCode', ':code'))->setParameter('code', $search['payment_code']);
         if(isset($search['p_order_state']) && !empty($search['p_order_state']))         $queryBuilder->andWhere($queryBuilder->expr()->eq('o.pOrderState', $search['p_order_state']));
         if(isset($search['start_time']) && !empty($search['start_time']))               $queryBuilder->andWhere($queryBuilder->expr()->gte('w.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
         if(isset($search['end_time']) && !empty($search['end_time']))                   $queryBuilder->andWhere($queryBuilder->expr()->lte('w.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));

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

@@ -40,7 +40,8 @@ $form->prepare();
 
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->PurchaseHelper()->orderPayment($this->orderInfo->getPaymentCode());?>
+                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getPaymentCode());?>
+                                    <?php /*echo $this->PurchaseHelper()->orderPayment($this->orderInfo->getPaymentCode());*/?>
                                 </div>
                             </div>
 

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

@@ -35,7 +35,8 @@
 
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->PurchaseHelper()->orderPayment($this->orderInfo->getPaymentCode());?>
+                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getPaymentCode());?>
+                                    <?php /*echo $this->PurchaseHelper()->orderPayment($this->orderInfo->getPaymentCode());*/?>
                                 </div>
                             </div>
 

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

@@ -65,7 +65,8 @@
 
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->PurchaseHelper()->orderPayment($this->orderInfo->getPaymentCode());?>
+                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getPaymentCode());?>
+                                    <?php /*echo $this->PurchaseHelper()->orderPayment($this->orderInfo->getPaymentCode());*/?>
                                 </div>
                             </div>
                         </div>