Commit 4e687ae3 authored by wxl's avatar wxl

将下拉付款方式改为填写方式

parent 9482c3a5
...@@ -82,7 +82,7 @@ class SalesOrderController extends AbstractActionController ...@@ -82,7 +82,7 @@ class SalesOrderController extends AbstractActionController
$search = []; $search = [];
$searchForm = new SearchSalesOrderForm(); $searchForm = new SearchSalesOrderForm();
$searchForm->get('customer_id')->setValueOptions($this->customerCommon()->customerListOption()); $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)); $searchForm->get('return_state')->setValueOptions(Common::existReturn($this->translator));
$salesOrderStateArray = Common::salesOrderState($this->translator); $salesOrderStateArray = Common::salesOrderState($this->translator);
unset($salesOrderStateArray[-5], $salesOrderStateArray[-1]); unset($salesOrderStateArray[-5], $salesOrderStateArray[-1]);
...@@ -109,7 +109,7 @@ class SalesOrderController extends AbstractActionController ...@@ -109,7 +109,7 @@ class SalesOrderController extends AbstractActionController
$form = new SalesOrderForm($this->entityManager); $form = new SalesOrderForm($this->entityManager);
$goodsForm = new SalesOrderGoodsForm($this->entityManager); $goodsForm = new SalesOrderGoodsForm($this->entityManager);
$form->get('receivablesCode')->setValueOptions(Common::receivable($this->translator)); //$form->get('receivablesCode')->setValueOptions(Common::receivable($this->translator));
$form->get('customerId')->setValueOptions($this->customerCommon()->customerListOption()); $form->get('customerId')->setValueOptions($this->customerCommon()->customerListOption());
if($this->getRequest()->isPost()) { if($this->getRequest()->isPost()) {
...@@ -161,7 +161,7 @@ class SalesOrderController extends AbstractActionController ...@@ -161,7 +161,7 @@ class SalesOrderController extends AbstractActionController
$form = new SalesOrderForm($this->entityManager, $salesOrderInfo); $form = new SalesOrderForm($this->entityManager, $salesOrderInfo);
$goodsForm = new SalesOrderGoodsForm($this->entityManager); $goodsForm = new SalesOrderGoodsForm($this->entityManager);
$form->get('receivablesCode')->setValueOptions(Common::receivable($this->translator)); //$form->get('receivablesCode')->setValueOptions(Common::receivable($this->translator));
$form->get('customerId')->setValueOptions($this->customerCommon()->customerListOption()); $form->get('customerId')->setValueOptions($this->customerCommon()->customerListOption());
if($this->getRequest()->isPost()) { if($this->getRequest()->isPost()) {
......
...@@ -45,13 +45,21 @@ class SalesOrderForm extends Form ...@@ -45,13 +45,21 @@ class SalesOrderForm extends Form
] ]
]); ]);
$this->add([ /*$this->add([
'type' => 'select', 'type' => 'select',
'name' => 'receivablesCode', 'name' => 'receivablesCode',
'attributes' => [ 'attributes' => [
'id' => 'receivablesCode', 'id' => 'receivablesCode',
'class' => 'form-control' 'class' => 'form-control'
] ]
]);*/
$this->add([
'type' => 'text',
'name' => 'receivablesCode',
'attributes' => [
'id' => 'receivablesCode',
'class' => 'form-control'
]
]); ]);
$this->add([ $this->add([
......
...@@ -47,7 +47,7 @@ class SalesOrderRepository extends EntityRepository ...@@ -47,7 +47,7 @@ class SalesOrderRepository extends EntityRepository
if(isset($search['customer_contacts']) && !empty($search['customer_contacts'])) $queryBuilder->andWhere($queryBuilder->expr()->like('s.customerContacts', "'%".$search['customer_contacts']."%'")); if(isset($search['customer_contacts']) && !empty($search['customer_contacts'])) $queryBuilder->andWhere($queryBuilder->expr()->like('s.customerContacts', "'%".$search['customer_contacts']."%'"));
if(isset($search['customer_phone']) && !empty($search['customer_phone'])) $queryBuilder->andWhere($queryBuilder->expr()->like('s.customerPhone', "'%".$search['customer_phone']."%'")); if(isset($search['customer_phone']) && !empty($search['customer_phone'])) $queryBuilder->andWhere($queryBuilder->expr()->like('s.customerPhone', "'%".$search['customer_phone']."%'"));
if(isset($search['customer_id']) && $search['customer_id'] > 0) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.customerId', $search['customer_id'])); if(isset($search['customer_id']) && $search['customer_id'] > 0) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.customerId', $search['customer_id']));
if(isset($search['receivables_code']) && !empty($search['receivables_code'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']); //if(isset($search['receivables_code']) && !empty($search['receivables_code'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']);
if(isset($search['sales_order_state']) && is_numeric($search['sales_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.salesOrderState', $search['sales_order_state'])); if(isset($search['sales_order_state']) && is_numeric($search['sales_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.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['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'])); if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('s.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
<div class="col-xs-4 form-group"> <div class="col-xs-4 form-group">
<div class="col-sm-12"> <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>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment