Commit 2283da3a authored by wxl's avatar wxl

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

parent 1c45b778
...@@ -100,7 +100,8 @@ class SearchWarehouseOrderForm extends Form ...@@ -100,7 +100,8 @@ class SearchWarehouseOrderForm extends Form
'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('请输入付款时间')
] ]
]); ]);
......
...@@ -96,11 +96,12 @@ class SearchSalesOrderForm extends Form ...@@ -96,11 +96,12 @@ class SearchSalesOrderForm extends Form
]); ]);
$this->add([ $this->add([
'type' => 'select', 'type' => 'text',
'name' => 'receivables_code', 'name' => 'receivables_code',
'attributes' => [ 'attributes' => [
'id' => 'receivables_code', 'id' => 'receivables_code',
'class' => 'form-control input-sm' 'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('请输入收款方式')
] ]
]); ]);
......
...@@ -85,7 +85,15 @@ class SearchSendOrderForm extends Form ...@@ -85,7 +85,15 @@ class SearchSendOrderForm extends Form
'placeholder' => $this->translator->translate('客户电话') 'placeholder' => $this->translator->translate('客户电话')
] ]
]); ]);
$this->add([
'type' => 'text',
'name' => 'receivables_code',
'attributes' => [
'id' => 'receivables_code',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('请输入收款方式')
]
]);
$this->add([ $this->add([
'type' => 'select', 'type' => 'select',
'name' => 'customer_id', 'name' => 'customer_id',
...@@ -171,14 +179,6 @@ class SearchSendOrderForm extends Form ...@@ -171,14 +179,6 @@ class SearchSendOrderForm extends Form
] ]
]); ]);
$this->add([
'type' => 'select',
'name' => 'receivables_code',
'attributes' => [
'id' => 'receivables_code',
'class' => 'form-control input-sm'
]
]);
$inputFilter->add([ $inputFilter->add([
'name' => 'customer_contacts', 'name' => 'customer_contacts',
......
...@@ -108,7 +108,8 @@ ...@@ -108,7 +108,8 @@
<td><?php echo $this->escapeHtml($order->getOneCustomer()->getCustomerName()); ?></td> <td><?php echo $this->escapeHtml($order->getOneCustomer()->getCustomerName()); ?></td>
<td><?php echo $this->escapeHtml($order->getCustomerContacts()); ?></td> <td><?php echo $this->escapeHtml($order->getCustomerContacts()); ?></td>
<td><?php echo $this->escapeHtml($order->getCustomerPhone()); ?></td> <td><?php echo $this->escapeHtml($order->getCustomerPhone()); ?></td>
<td><?php echo $this->salesHelper()->orderReceivables($order->getReceivablesCode()); ?></td> <td><?php echo $this->escapeHtml($order->getReceivablesCode()); ?>
<?php /*echo $this->salesHelper()->orderReceivables($order->getReceivablesCode()); */?></td>
<td><?php echo $this->erpCurrencyFormat($order->getSalesOrderAmount());?></td> <td><?php echo $this->erpCurrencyFormat($order->getSalesOrderAmount());?></td>
<td><?php echo $this->salesHelper()->salesOrderState($order->getSalesOrderState(), 2); ?></td> <td><?php echo $this->salesHelper()->salesOrderState($order->getSalesOrderState(), 2); ?></td>
<td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td> <td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td>
......
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
<td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getOneCustomer()->getCustomerName()); ?></td> <td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getOneCustomer()->getCustomerName()); ?></td>
<td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getCustomerContacts()); ?></td> <td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getCustomerContacts()); ?></td>
<td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getCustomerPhone()); ?></td> <td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getCustomerPhone()); ?></td>
<td><?php echo $this->salesHelper()->orderReceivables($order->getOneSalesOrder()->getReceivablesCode()); ?></td> <td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getReceivablesCode()); ?>
<?php /*echo $this->salesHelper()->orderReceivables($order->getOneSalesOrder()->getReceivablesCode()); */?></td>
<td><?php echo $this->erpCurrencyFormat($order->getOneSalesOrder()->getSalesOrderAmount());?></td> <td><?php echo $this->erpCurrencyFormat($order->getOneSalesOrder()->getSalesOrderAmount());?></td>
<td><?php echo $this->salesHelper()->salesOrderState($order->getOneSalesOrder()->getSalesOrderState(), 2); ?></td> <td><?php echo $this->salesHelper()->salesOrderState($order->getOneSalesOrder()->getSalesOrderState(), 2); ?></td>
<td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td> <td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td>
......
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