Commit 7948c467 authored by wxl's avatar wxl

将资金管理下拉付款方式改为填写方式

parent f100e9a5
...@@ -66,7 +66,7 @@ class PayableController extends AbstractActionController ...@@ -66,7 +66,7 @@ class PayableController extends AbstractActionController
$search = []; $search = [];
$searchForm = new SearchPayableForm(); $searchForm = new SearchPayableForm();
$searchForm->get('payment_code')->setValueOptions(Common::payment($this->translator)); //$searchForm->get('payment_code')->setValueOptions(Common::payment($this->translator));
if($this->getRequest()->isGet()) { if($this->getRequest()->isGet()) {
$data = $this->params()->fromQuery(); $data = $this->params()->fromQuery();
$searchForm->setData($data); $searchForm->setData($data);
......
...@@ -63,7 +63,7 @@ class ReceivablesController extends AbstractActionController ...@@ -63,7 +63,7 @@ class ReceivablesController extends AbstractActionController
$search = []; $search = [];
$searchForm = new SearchReceivableForm(); $searchForm = new SearchReceivableForm();
$searchForm->get('receivable_code')->setValueOptions(Common::receivable($this->translator)); //$searchForm->get('receivable_code')->setValueOptions(Common::receivable($this->translator));
if($this->getRequest()->isGet()) { if($this->getRequest()->isGet()) {
$data = $this->params()->fromQuery(); $data = $this->params()->fromQuery();
$searchForm->setData($data); $searchForm->setData($data);
......
...@@ -97,11 +97,12 @@ class SearchPayableForm extends Form ...@@ -97,11 +97,12 @@ class SearchPayableForm extends Form
]); ]);
$this->add([ $this->add([
'type' => 'select', 'type' => 'text',
'name' => 'payment_code', 'name' => 'payment_code',
'attributes' => [ 'attributes' => [
'id' => 'payment_code', 'id' => 'payment_code',
'class' => 'form-control input-sm' 'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('请输入付款方式')
] ]
]); ]);
} }
......
...@@ -97,11 +97,12 @@ class SearchReceivableForm extends Form ...@@ -97,11 +97,12 @@ class SearchReceivableForm extends Form
]); ]);
$this->add([ $this->add([
'type' => 'select', 'type' => 'text',
'name' => 'receivable_code', 'name' => 'receivable_code',
'attributes' => [ 'attributes' => [
'id' => 'receivable_code', 'id' => 'receivable_code',
'class' => 'form-control input-sm' 'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('请输入付款方式')
] ]
]); ]);
} }
......
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
<td><?php echo $this->escapeHtml($PayableValue->getPOrderSn()); ?></td> <td><?php echo $this->escapeHtml($PayableValue->getPOrderSn()); ?></td>
<!--<td></td>--> <!--<td></td>-->
<td><?php echo $this->escapeHtml($PayableValue->getSupplierName());?></td> <td><?php echo $this->escapeHtml($PayableValue->getSupplierName());?></td>
<td><?php echo $this->PurchaseHelper()->orderPayment($PayableValue->getPaymentCode());?></td> <td><?php echo $this->escapeHtml($PayableValue->getPaymentCode());?>
<?php /*echo $this->PurchaseHelper()->orderPayment($PayableValue->getPaymentCode());*/?></td>
<td><?php echo $this->erpCurrencyFormat($PayableValue->getPaymentAmount()); ?></td> <td><?php echo $this->erpCurrencyFormat($PayableValue->getPaymentAmount()); ?></td>
<td> <td>
<span <?php echo ($PayableValue->getPaymentAmount() == $PayableValue->getFinishAmount() ? 'class="text-green"' : ''); ?>><?php echo $this->erpCurrencyFormat($PayableValue->getFinishAmount()); ?></span> <span <?php echo ($PayableValue->getPaymentAmount() == $PayableValue->getFinishAmount() ? 'class="text-green"' : ''); ?>><?php echo $this->erpCurrencyFormat($PayableValue->getFinishAmount()); ?></span>
......
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
<td><?php echo $this->escapeHtml($receivableValue->getSalesOrderSn()); ?></td> <td><?php echo $this->escapeHtml($receivableValue->getSalesOrderSn()); ?></td>
<!--<td></td>--> <!--<td></td>-->
<td><?php echo $this->escapeHtml($receivableValue->getCustomerName());?></td> <td><?php echo $this->escapeHtml($receivableValue->getCustomerName());?></td>
<td><?php echo $this->salesHelper()->orderReceivables($receivableValue->getReceivableCode()); ?></td> <td><?php echo $this->escapeHtml($receivableValue->getReceivableCode());?>
<?php /*echo $this->salesHelper()->orderReceivables($receivableValue->getReceivableCode()); */?></td>
<td><?php echo $this->erpCurrencyFormat($receivableValue->getReceivableAmount()); ?></td> <td><?php echo $this->erpCurrencyFormat($receivableValue->getReceivableAmount()); ?></td>
<td> <td>
<span <?php echo ($receivableValue->getReceivableAmount() == $receivableValue->getFinishAmount() ? 'class="text-green"' : ''); ?>><?php echo $this->erpCurrencyFormat($receivableValue->getFinishAmount()); ?></span> <span <?php echo ($receivableValue->getReceivableAmount() == $receivableValue->getFinishAmount() ? 'class="text-green"' : ''); ?>><?php echo $this->erpCurrencyFormat($receivableValue->getFinishAmount()); ?></span>
......
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