将销售订单下拉付款方式改为填写方式

module/Sales/src/Controller/SalesSendOrderController.php

@@ -54,7 +54,7 @@ class SalesSendOrderController extends AbstractActionController
         $search = [];
         $searchForm = new SearchSendOrderForm();
         $searchForm->get('customer_id')->setValueOptions($this->customerCommon()->customerListOption());
-        $searchForm->get('receivables_code')->setValueOptions(Common::receivable($this->translator));
+        //$searchForm->get('receivables_code')->setValueOptions(Common::receivable($this->translator));
         $searchForm->get('return_state')->setValueOptions(Common::existReturn($this->translator));
         $salesOrderStateArray = Common::salesOrderState($this->translator);
         $searchForm->get('sales_order_state')->setValueOptions([6 => $salesOrderStateArray[6], 12 => $salesOrderStateArray[12]]);

module/Sales/src/Repository/SalesSendOrderRepository.php

@@ -46,7 +46,7 @@ class SalesSendOrderRepository extends EntityRepository
         if(isset($search['customer_contacts']) && !empty($search['customer_contacts'])) $queryBuilder->andWhere($queryBuilder->expr()->like('o.customerContacts', "'%".$search['customer_contacts']."%'"));
         if(isset($search['customer_phone']) && !empty($search['customer_phone']))       $queryBuilder->andWhere($queryBuilder->expr()->like('o.customerPhone', "'%".$search['customer_phone']."%'"));
         if(isset($search['customer_id']) && $search['customer_id'] > 0)                 $queryBuilder->andWhere($queryBuilder->expr()->eq('o.customerId', $search['customer_id']));
-        if(isset($search['receivables_code']) && !empty($search['receivables_code']))   $queryBuilder->andWhere($queryBuilder->expr()->eq('o.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']);
+        //if(isset($search['receivables_code']) && !empty($search['receivables_code']))   $queryBuilder->andWhere($queryBuilder->expr()->eq('o.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']);
         if(isset($search['sales_order_state']) && is_numeric($search['sales_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.salesOrderState', $search['sales_order_state']));
         if(isset($search['return_state']) && is_numeric($search['return_state']))           $queryBuilder->andWhere($queryBuilder->expr()->eq('s.returnState', $search['return_state']));
         if(isset($search['start_time']) && !empty($search['start_time']))               $queryBuilder->andWhere($queryBuilder->expr()->gte('s.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));

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

@@ -48,7 +48,8 @@ $form->prepare();
 
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->salesHelper()->orderReceivables($this->sendOrderInfo->getOneSalesOrder()->getReceivablesCode());?>
+                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->escapeHtml($this->sendOrderInfo->getOneSalesOrder()->getReceivablesCode());?>
+                                    <?php /*echo $this->salesHelper()->orderReceivables($this->sendOrderInfo->getOneSalesOrder()->getReceivablesCode());*/?>
                                 </div>
                             </div>
 

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

@@ -43,7 +43,8 @@
 
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->salesHelper()->orderReceivables($this->returnInfo->getOneSalesOrder()->getReceivablesCode());?>
+                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->escapeHtml($this->returnInfo->getOneSalesOrder()->getReceivablesCode());?>
+                                    <?php /*echo $this->salesHelper()->orderReceivables($this->returnInfo->getOneSalesOrder()->getReceivablesCode());*/?>
                                 </div>
                             </div>
 

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

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

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

@@ -43,7 +43,8 @@
 
                             <div class="col-xs-4 form-group">
                                 <div class="col-sm-12">
-                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->salesHelper()->orderReceivables($this->sendOrderInfo->getOneSalesOrder()->getReceivablesCode());?>
+                                    <b><?php echo $this->translate('付款方式'); ?>：</b><?php echo $this->escapeHtml($this->sendOrderInfo->getOneSalesOrder()->getReceivablesCode());?>
+                                    <?php /*echo $this->salesHelper()->orderReceivables($this->sendOrderInfo->getOneSalesOrder()->getReceivablesCode());*/?>
                                 </div>
                             </div>