Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
3b656c9b
Commit
3b656c9b
authored
Aug 22, 2023
by
邓春圆
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
84bdce80
59d1a21f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
4 deletions
+35
-4
order.js
src/api/ecw/order.js
+10
-0
tagsView.js
src/store/modules/tagsView.js
+3
-0
makeLadingBill.vue
src/views/ecw/box/ladingBill/makeLadingBill.vue
+10
-1
printTag.vue
src/views/ecw/box/shippingAir/nodePage/mergePkg/printTag.vue
+1
-1
detail.vue
src/views/ecw/order/detail.vue
+3
-0
stockingList.vue
src/views/ecw/order/stockingList.vue
+8
-2
No files found.
src/api/ecw/order.js
View file @
3b656c9b
...
...
@@ -874,6 +874,16 @@ export function exportReadyStock(params){
})
}
// 导出可出订单
export
function
exportCanShipment
(
params
){
return
request
({
url
:
'
/ecw/order/export/can-shipment/search
'
,
method
:
'
get
'
,
params
,
responseType
:
'
blob
'
})
}
// 无需打包
export
function
noNeedPack
(
orderItemId
){
return
request
({
...
...
src/store/modules/tagsView.js
View file @
3b656c9b
...
...
@@ -6,6 +6,9 @@ const state = {
}
// 获取页面的缓存名称
const
getViewName
=
(
view
)
=>
{
if
(
!
view
.
meta
?.
componentPath
){
return
view
.
fullPath
}
return
view
.
meta
.
componentPath
.
split
(
'
/
'
).
map
(
item
=>
item
.
substring
(
0
,
1
).
toUpperCase
()
+
item
.
substring
(
1
).
toLowerCase
()).
join
(
''
)
}
...
...
src/views/ecw/box/ladingBill/makeLadingBill.vue
View file @
3b656c9b
...
...
@@ -178,6 +178,10 @@ export default {
},
// 先获取订单信息,pdf用 订单号+唛头命名
createPdf
(){
// 空运的由接口生成pdf,所以直接提交即可
if
(
this
.
$route
.
fullPath
.
toLowerCase
().
indexOf
(
'
air
'
)
>
-
1
){
return
this
.
submit
()
}
getOrder
(
this
.
currRow
.
orderId
).
then
(
res
=>
{
this
.
afterCreatePdf
(
res
.
data
)
})
...
...
@@ -218,11 +222,16 @@ export default {
},
submit
(
imgUrl
)
{
let
params
=
{
imgUrl
,
billContent
:
this
.
billContent
,
orderId
:
this
.
currRow
.
orderId
,
copyUserId
:
this
.
selectedUsers
,
};
// 有pdf地址则提交,没有则指定后端生成
if
(
imgUrl
){
params
.
imgUrl
=
imgUrl
}
else
{
params
.
needBackend
=
true
}
if
([
"
makeBill
"
,
"
resetBill
"
].
includes
(
this
.
dialogCfg
.
type
))
{
createBillService
({
...
params
,
status
:
1
}).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
((
res
)
=>
{
...
...
src/views/ecw/box/shippingAir/nodePage/mergePkg/printTag.vue
View file @
3b656c9b
...
...
@@ -27,7 +27,7 @@
</p>
<div
style=
"border-top: 1px solid #999;margin-left: 10px;"
/>
<div
style=
"display: flex;margin-top: 10px;"
>
<div
style=
"border-right:
2
px solid #999;width: 45px;"
>
<div
style=
"border-right:
1
px solid #999;width: 45px;"
>
<p
style=
"margin-top: 1mm; text-align: center"
>
<span
style=
"text-align: center; font-weight: 600; font-size: 4mm"
>
{{
tagData
.
transportName
}}
</span>
</p>
...
...
src/views/ecw/order/detail.vue
View file @
3b656c9b
...
...
@@ -144,6 +144,9 @@
<el-descriptions-item
:label=
"$t('创建时间')"
>
{{order.createTime|parseTime}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户经理')"
>
{{order.salesmanName}}
</el-descriptions-item>
</el-descriptions>
</el-card>
...
...
src/views/ecw/order/stockingList.vue
View file @
3b656c9b
...
...
@@ -192,7 +192,13 @@ import { getProductAttrList } from '@/api/ecw/productAttr'
import
CustomerSelector
from
'
@/components/CustomerSelector
'
import
specialNeeds
from
'
@/views/ecw/order/components/specialNeeds
'
;
import
{
canReadyStockShipmentPage
,
exportReadyStock
,
canShipmentPage
,
orderSpecialNeed
}
from
"
@/api/ecw/order
"
;
import
{
canReadyStockShipmentPage
,
exportReadyStock
,
canShipmentPage
,
orderSpecialNeed
,
exportCanShipment
}
from
"
@/api/ecw/order
"
;
import
PrintTag
from
'
./components/PrintTag
'
import
PrintWarehouseReceipt
from
'
./components/PrintWarehouseReceipt
'
import
PrintLadingBill
from
'
./components/PrintLadingBill
'
...
...
@@ -342,7 +348,7 @@ export default {
// 导出
exportXls
(
params
){
this
.
exporting
=
true
export
ReadyStock
(
params
).
then
(
res
=>
{
export
CanShipment
(
params
).
then
(
res
=>
{
this
.
$download
.
excel
(
res
,
this
.
$t
(
'
备货订单
'
)
+
'
.xls
'
);
}).
finally
(()
=>
{
this
.
exporting
=
false
...
...
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