Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
蒋勇
zhichan
Commits
4ea713a8
Commit
4ea713a8
authored
Aug 15, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 交付单
parent
a6b13819
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
+1
-1
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
+10
-10
No files found.
tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
4ea713a8
...
@@ -85,7 +85,7 @@ class DeliverybillCtl extends CtlBase {
...
@@ -85,7 +85,7 @@ class DeliverybillCtl extends CtlBase {
if
(
!
pobj
.
deliverId
)
{
if
(
!
pobj
.
deliverId
)
{
throw
new
Error
(
"deliverId 不能为空"
);
throw
new
Error
(
"deliverId 不能为空"
);
}
}
if
(
!
pobj
.
co
mpany
Name
||
!
pobj
.
time
||
!
accountingType
||
!
pobj
.
taxpayerType
||
!
pobj
.
supplier
)
{
if
(
!
pobj
.
co
ntacts
Name
||
!
pobj
.
time
||
!
accountingType
||
!
pobj
.
taxpayerType
||
!
pobj
.
supplier
)
{
throw
new
Error
(
"参数不能为空"
);
throw
new
Error
(
"参数不能为空"
);
}
}
const
rs
=
await
this
.
service
.
setupBill
(
pobj
);
const
rs
=
await
this
.
service
.
setupBill
(
pobj
);
...
...
tx-fi-tax/app/base/service/impl/bizchance/deliverybillSve.js
View file @
4ea713a8
...
@@ -26,7 +26,7 @@ class DeliverybillService extends ServiceBase {
...
@@ -26,7 +26,7 @@ class DeliverybillService extends ServiceBase {
updateResult
=
{
updateResult
=
{
delivery_info
:
{
delivery_info
:
{
...
delivery_info
,
...
delivery_info
,
setUpAt
:
pobj
.
setUpAt
setUpAt
:
pobj
.
setUpAt
//建账时间
},
},
delivery_status
:
system
.
SERVERSESTATUS
.
WAITUSERCONFIRM
delivery_status
:
system
.
SERVERSESTATUS
.
WAITUSERCONFIRM
}
}
...
@@ -65,7 +65,7 @@ class DeliverybillService extends ServiceBase {
...
@@ -65,7 +65,7 @@ class DeliverybillService extends ServiceBase {
...
delivery_info
,
...
delivery_info
,
setupStatus
:
system
.
SERVERSESTATUS
.
SETUP
,
setupStatus
:
system
.
SERVERSESTATUS
.
SETUP
,
setupInfo
:
{
setupInfo
:
{
co
mpanyName
:
pobj
.
company
Name
,
co
ntactsName
:
pobj
.
contacts
Name
,
time
:
pobj
.
time
,
time
:
pobj
.
time
,
accountingType
:
pobj
.
accountingType
,
accountingType
:
pobj
.
accountingType
,
taxpayerType
:
pobj
.
taxpayerType
,
taxpayerType
:
pobj
.
taxpayerType
,
...
@@ -110,15 +110,15 @@ class DeliverybillService extends ServiceBase {
...
@@ -110,15 +110,15 @@ class DeliverybillService extends ServiceBase {
});
});
if
(
schemeData
)
{
if
(
schemeData
)
{
result
.
schemeData
=
{
result
.
schemeData
=
{
demandCode
:
schemeData
.
demand_code
,
demandCode
:
schemeData
.
demand_code
,
// 需求编号
schemeCode
:
deliverData
.
scheme_number
,
schemeCode
:
deliverData
.
scheme_number
,
//方案编号
// 服务类型
// 服务类型
companyType
:
schemeData
.
company_type
,
companyType
:
schemeData
.
company_type
,
//公司类型
area
:
schemeData
.
service_name
,
area
:
schemeData
.
service_name
,
//服务地区
buyDuration
:
schemeData
.
buy_duration
,
buyDuration
:
schemeData
.
buy_duration
,
//购买时长
buyNumber
:
schemeData
.
number
,
buyNumber
:
schemeData
.
number
,
//购买数量
totalCost
:
schemeData
.
total_cost
,
totalCost
:
schemeData
.
total_cost
,
//总计费用
note
:
schemeData
.
remarks
note
:
schemeData
.
remarks
//需求编号
}
}
}
}
}
}
...
...
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