Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dsyerp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sugar
dsyerp
Commits
2283da3a
Commit
2283da3a
authored
Apr 22, 2023
by
wxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将销售订单下拉付款方式改为填写方式
parent
1c45b778
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
14 deletions
+18
-14
module/Purchase/src/Form/SearchWarehouseOrderForm.php
module/Purchase/src/Form/SearchWarehouseOrderForm.php
+2
-1
module/Sales/src/Form/SearchSalesOrderForm.php
module/Sales/src/Form/SearchSalesOrderForm.php
+3
-2
module/Sales/src/Form/SearchSendOrderForm.php
module/Sales/src/Form/SearchSendOrderForm.php
+9
-9
module/Sales/view/sales/sales-order/index.phtml
module/Sales/view/sales/sales-order/index.phtml
+2
-1
module/Sales/view/sales/sales-send-order/index.phtml
module/Sales/view/sales/sales-send-order/index.phtml
+2
-1
No files found.
module/Purchase/src/Form/SearchWarehouseOrderForm.php
View file @
2283da3a
...
...
@@ -100,7 +100,8 @@ class SearchWarehouseOrderForm extends Form
'name'
=>
'payment_code'
,
'attributes'
=>
[
'id'
=>
'payment_code'
,
'class'
=>
'form-control input-sm'
'class'
=>
'form-control input-sm'
,
'placeholder'
=>
$this
->
translator
->
translate
(
'请输入付款时间'
)
]
]);
...
...
module/Sales/src/Form/SearchSalesOrderForm.php
View file @
2283da3a
...
...
@@ -96,11 +96,12 @@ class SearchSalesOrderForm extends Form
]);
$this
->
add
([
'type'
=>
'
selec
t'
,
'type'
=>
'
tex
t'
,
'name'
=>
'receivables_code'
,
'attributes'
=>
[
'id'
=>
'receivables_code'
,
'class'
=>
'form-control input-sm'
'class'
=>
'form-control input-sm'
,
'placeholder'
=>
$this
->
translator
->
translate
(
'请输入收款方式'
)
]
]);
...
...
module/Sales/src/Form/SearchSendOrderForm.php
View file @
2283da3a
...
...
@@ -85,7 +85,15 @@ class SearchSendOrderForm extends Form
'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
([
'type'
=>
'select'
,
'name'
=>
'customer_id'
,
...
...
@@ -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
([
'name'
=>
'customer_contacts'
,
...
...
module/Sales/view/sales/sales-order/index.phtml
View file @
2283da3a
...
...
@@ -108,7 +108,8 @@
<td>
<?php
echo
$this
->
escapeHtml
(
$order
->
getOneCustomer
()
->
getCustomerName
());
?>
</td>
<td>
<?php
echo
$this
->
escapeHtml
(
$order
->
getCustomerContacts
());
?>
</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
->
salesHelper
()
->
salesOrderState
(
$order
->
getSalesOrderState
(),
2
);
?>
</td>
<td>
<?php
echo
(
$order
->
getReturnState
()
==
1
?
'<b class="text-danger">'
.
$this
->
translate
(
'有'
)
.
'</b>'
:
$this
->
translate
(
'无'
));
?>
</td>
...
...
module/Sales/view/sales/sales-send-order/index.phtml
View file @
2283da3a
...
...
@@ -105,7 +105,8 @@
<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
()
->
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
->
salesHelper
()
->
salesOrderState
(
$order
->
getOneSalesOrder
()
->
getSalesOrderState
(),
2
);
?>
</td>
<td>
<?php
echo
(
$order
->
getReturnState
()
==
1
?
'<b class="text-danger">'
.
$this
->
translate
(
'有'
)
.
'</b>'
:
$this
->
translate
(
'无'
));
?>
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment