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
7948c467
Commit
7948c467
authored
Apr 27, 2023
by
wxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
将资金管理下拉付款方式改为填写方式
parent
f100e9a5
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
8 deletions
+12
-8
module/Finance/src/Controller/PayableController.php
module/Finance/src/Controller/PayableController.php
+1
-1
module/Finance/src/Controller/ReceivablesController.php
module/Finance/src/Controller/ReceivablesController.php
+1
-1
module/Finance/src/Form/SearchPayableForm.php
module/Finance/src/Form/SearchPayableForm.php
+3
-2
module/Finance/src/Form/SearchReceivableForm.php
module/Finance/src/Form/SearchReceivableForm.php
+3
-2
module/Finance/view/finance/payable/index.phtml
module/Finance/view/finance/payable/index.phtml
+2
-1
module/Finance/view/finance/receivables/index.phtml
module/Finance/view/finance/receivables/index.phtml
+2
-1
No files found.
module/Finance/src/Controller/PayableController.php
View file @
7948c467
...
@@ -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
);
...
...
module/Finance/src/Controller/ReceivablesController.php
View file @
7948c467
...
@@ -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
);
...
...
module/Finance/src/Form/SearchPayableForm.php
View file @
7948c467
...
@@ -97,11 +97,12 @@ class SearchPayableForm extends Form
...
@@ -97,11 +97,12 @@ class SearchPayableForm extends Form
]);
]);
$this
->
add
([
$this
->
add
([
'type'
=>
'
selec
t'
,
'type'
=>
'
tex
t'
,
'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
(
'请输入付款方式'
)
]
]
]);
]);
}
}
...
...
module/Finance/src/Form/SearchReceivableForm.php
View file @
7948c467
...
@@ -97,11 +97,12 @@ class SearchReceivableForm extends Form
...
@@ -97,11 +97,12 @@ class SearchReceivableForm extends Form
]);
]);
$this
->
add
([
$this
->
add
([
'type'
=>
'
selec
t'
,
'type'
=>
'
tex
t'
,
'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
(
'请输入付款方式'
)
]
]
]);
]);
}
}
...
...
module/Finance/view/finance/payable/index.phtml
View file @
7948c467
...
@@ -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>
...
...
module/Finance/view/finance/receivables/index.phtml
View file @
7948c467
...
@@ -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>
...
...
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