Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dwsproject
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dws
dwsproject
Commits
02074aa0
Commit
02074aa0
authored
Feb 20, 2025
by
夏超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] 玖姿收入支出添加类型字段
parent
445041dc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
roke_product_income_expense/controller/main.py
+3
-0
roke_product_income_expense/static/src/js/index.html
+1
-0
No files found.
roke_product_income_expense/controller/main.py
View file @
02074aa0
...
...
@@ -95,12 +95,15 @@ class ProductIncomeExpenseIframe(http.Controller):
start_date
=
kwargs
.
get
(
"start_date"
,
""
)
end_date
=
kwargs
.
get
(
"end_date"
,
""
)
type_str
=
kwargs
.
get
(
"type_str"
,
False
)
# income收入/expenditure支出
machinery_type
=
kwargs
.
get
(
"machinery_type"
,
False
)
# income收入/expenditure支出
domain
=
[]
if
start_date
and
end_date
:
domain
.
append
((
"business_date"
,
">="
,
start_date
))
domain
.
append
((
"business_date"
,
"<="
,
end_date
))
if
type_str
:
domain
.
append
((
type_str
,
">"
,
0.0
))
if
machinery_type
:
domain
.
append
((
"machinery_type"
,
"="
,
machinery_type
))
data_list
=
_self
.
env
[
"roke.product.income.expense"
]
.
sudo
()
.
search
(
domain
,
order
=
"business_date desc, create_date desc"
)
data
=
[]
for
v
in
data_list
:
...
...
roke_product_income_expense/static/src/js/index.html
View file @
02074aa0
...
...
@@ -324,6 +324,7 @@
formData
.
append
(
"start_date"
,
this
.
datePickerValue
[
0
]);
formData
.
append
(
"end_date"
,
this
.
datePickerValue
[
1
]);
formData
.
append
(
"type_str"
,
this
.
select_value
);
formData
.
append
(
"machinery_type"
,
this
.
machinery_type_value
);
axios
.
post
(
"/roke/product/product_income_expense/export"
,
formData
,
_config
,
...
...
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