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
191c8a4a
Commit
191c8a4a
authored
Jul 25, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator
into dev
parents
e5601c9b
aeb9ed32
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
145 additions
and
64 deletions
+145
-64
indexAir.vue
src/views/ecw/box/indexAir.vue
+32
-16
indexSea.vue
src/views/ecw/box/indexSea.vue
+20
-0
seaProcess.vue
src/views/ecw/box/shippingAir/seaProcess.vue
+5
-5
splitOrder.vue
...views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
+13
-4
PrintTag.vue
src/views/ecw/order/components/PrintTag.vue
+7
-3
edit.vue
src/views/ecw/order/edit.vue
+24
-12
index.vue
src/views/ecw/order/index.vue
+8
-2
index.vue
src/views/ecw/order/splitApply/index.vue
+10
-3
Warehouse.vue
src/views/ecw/order/warehousing/components/Warehouse.vue
+17
-14
index.vue
src/views/ecw/warehouse/index.vue
+9
-5
No files found.
src/views/ecw/box/indexAir.vue
View file @
191c8a4a
...
...
@@ -26,17 +26,22 @@
<el-option
v-for=
"dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)"
:key=
"dict.value"
:label=
"$l(dict, 'label')"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
""
prop=
"date"
>
<el-select
v-model=
"queryParams.dateType"
:placeholder=
"$t('请选择时间类型')"
clearable
size=
"small"
>
<el-option
v-for=
"item in dateTypes"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
""
>
<el-date-picker
v-model=
"queryParams.dateRangeCreateTime"
style=
"width: 240px"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetimerange"
range-separator=
"-"
start-:placeholder=
"$t('开始日期')"
end-:placeholder=
"$t('结束日期')"
/>
</el-form-item>
<el-row>
<el-form-item
:label=
"$t('时间')"
prop=
"date"
>
<el-select
v-model=
"queryParams.dateType"
:placeholder=
"$t('请选择时间类型')"
clearable
size=
"small"
>
<el-option
v-for=
"item in dateTypes"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
""
>
<el-date-picker
v-model=
"queryParams.dateRangeCreateTime"
style=
"width: 240px"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetimerange"
range-separator=
"-"
start-:placeholder=
"$t('开始日期')"
end-:placeholder=
"$t('结束日期')"
/>
</el-form-item>
<el-form-item
:label=
"$t('提单制作')"
prop=
"ladingBillStatus"
>
<el-select
v-model=
"queryParams.ladingBillStatus"
:placeholder=
"$t('请选择提单制作状态')"
clearable
size=
"small"
>
<el-option
v-for=
"(item,index) in ladingBillStatusData"
:key=
"index"
:label=
"item"
:value=
"index"
>
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
...
...
@@ -86,6 +91,12 @@
<el-table-column
:label=
"$t('状态')"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
:label=
"$t('提单状态')"
align=
"center"
prop=
"ladingBillStatus"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
ladingBillStatusData
[
scope
.
row
.
ladingBillStatus
]
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('日期')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
new
Date
(
scope
.
row
.
createTime
).
format
(
'
yyyy-MM-dd hh:mm:ss
'
)
}}
</span>
...
...
@@ -116,7 +127,7 @@
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination
v-show=
"total > 0"
:total=
"total"
:page.sync=
"queryParams.page
No"
:limit.sync=
"queryParams.pageSize
"
@
pagination=
"getList"
/>
<pagination
v-show=
"total > 0"
:total=
"total"
:page.sync=
"queryParams.page
"
:limit.sync=
"queryParams.rows
"
@
pagination=
"getList"
/>
<!-- 对话框(添加 / 修改) -->
<el-dialog
:title=
"dialogCfg.title"
:visible.sync=
"dialogCfg.open"
:width=
"dialogCfg.width"
:fullscreen=
"dialogCfg.fullscreen"
append-to-body
class=
"shippingSea-dialog"
>
...
...
@@ -229,8 +240,8 @@ export default {
transportTypes
:
[],
// 查询参数
queryParams
:
{
page
No
:
1
,
pageSize
:
10
,
page
:
1
,
rows
:
10
,
id
:
null
,
selfNo
:
null
,
cubNo
:
null
,
...
...
@@ -267,7 +278,12 @@ export default {
trigger
:
'
blur
'
}
]
}
}
,
ladingBillStatusData
:
[
this
.
$t
(
"
未完成
"
),
this
.
$t
(
"
部分完成
"
),
this
.
$t
(
"
已完成
"
),
],
}
}
,
computed
:
{
...
...
@@ -358,7 +374,7 @@ export default {
}
,
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
page
No
=
1
this
.
queryParams
.
page
=
1
this
.
getList
()
}
,
/** 重置按钮操作 */
...
...
src/views/ecw/box/indexSea.vue
View file @
191c8a4a
...
...
@@ -56,6 +56,14 @@
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('提单制作')"
prop=
"ladingBillStatus"
>
<el-select
v-model=
"queryParams.ladingBillStatus"
:placeholder=
"$t('请选择提单制作状态')"
clearable
size=
"small"
>
<el-option
v-for=
"(item,index) in ladingBillStatusData"
:key=
"index"
:label=
"item"
:value=
"index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
...
...
@@ -107,6 +115,13 @@
<el-table-column
:label=
"$t('状态')"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
:label=
"$t('提单状态')"
align=
"center"
prop=
"ladingBillStatus"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
ladingBillStatusData
[
scope
.
row
.
ladingBillStatus
]
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('日期')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
new
Date
(
scope
.
row
.
createTime
).
format
(
'
yyyy-MM-dd hh:mm:ss
'
)
}}
</span>
...
...
@@ -268,6 +283,11 @@ export default {
// 通知列表
noticeList
:
[],
allUsers
:
[],
ladingBillStatusData
:
[
this
.
$t
(
"
未完成
"
),
this
.
$t
(
"
部分完成
"
),
this
.
$t
(
"
已完成
"
),
],
}
;
}
,
computed
:
{
...
...
src/views/ecw/box/shippingAir/seaProcess.vue
View file @
191c8a4a
...
...
@@ -144,6 +144,7 @@ export default {
return
;
}
if
(
currIndex
>
this
.
currIndex
)
{
console
.
log
(
currIndex
,
this
.
currIndex
)
this
.
$message
.
error
(
this
.
errorMsg
);
return
;
}
...
...
@@ -240,15 +241,14 @@ export default {
continue
;
}
//合包非必须步骤
if
(
type
===
"
mergePkg
"
){
++
nodeIndex
;
}
const
{
start
,
wait
,
end
}
=
status
;
if
(
start
.
includes
(
val
[
keyName
]))
{
node
.
currStatus
=
"
start
"
;
if
(
type
===
"
mergePkg
"
){
++
nodeIndex
;
continue
;
}
}
if
(
start
.
includes
(
val
[
keyName
])
&&
val
[
voName
])
{
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @
191c8a4a
...
...
@@ -828,8 +828,8 @@ export default {
remarks
:
this
.
shopForm
.
remarks
,
volume
:
this
.
putin
.
volume
,
weight
:
this
.
putin
.
weight
,
chargeWeight
:
this
.
putin
.
chargeWeight
,
chargeVolume
:
this
.
putin
.
chargeVolume
,
chargeWeight
:
this
.
shopForm
.
chargeWeight
,
chargeVolume
:
this
.
shopForm
.
chargeVolume
,
worth
:
this
.
shopForm
.
worth
||
0
,
specsRecordVOList
:
this
.
shopForm
.
specsRecordVOList
,
shipmentSplit
:
true
...
...
@@ -950,8 +950,17 @@ export default {
// 根据比例计算默认的收费方数和收费重量
const
orderItem
=
this
.
orderData
.
orderItemVOList
.
find
(
item
=>
item
.
orderItemId
==
this
.
shopForm
.
orderItemId
)
const
rate
=
this
.
putin
.
num
/
orderItem
.
warehouseInInfoVO
.
cartonsNum
this
.
$set
(
this
.
shopForm
,
'
chargeVolume
'
,
(
orderItem
.
chargeVolume
*
rate
).
toFixed
(
2
))
this
.
$set
(
this
.
shopForm
,
'
chargeWeight
'
,
(
orderItem
.
chargeWeight
*
rate
).
toFixed
(
2
))
/*
* 1 普货 2 重货 3 泡货
* 普货 收费数据=入仓数据
* 泡货 收费方数=入仓方数 收费重量 = 品名收费重量*比例
* 重货 收费方数=品名收费方数*比例 收费重量 = 入仓重量
* */
const
chargeVolume
=
orderItem
.
itemType
===
2
?
(
orderItem
.
chargeVolume
*
rate
).
toFixed
(
2
)
:
this
.
putin
.
volume
const
chargeWeight
=
orderItem
.
itemType
===
3
?
(
orderItem
.
chargeWeight
*
rate
).
toFixed
(
2
)
:
this
.
putin
.
weight
this
.
$set
(
this
.
shopForm
,
'
chargeVolume
'
,
chargeVolume
)
this
.
$set
(
this
.
shopForm
,
'
chargeWeight
'
,
chargeWeight
)
this
.
$set
(
this
.
shopForm
,
'
worth
'
,
(
orderItem
.
worth
*
rate
).
toFixed
(
2
))
},
// 清空放入记录
...
...
src/views/ecw/order/components/PrintTag.vue
View file @
191c8a4a
...
...
@@ -77,7 +77,8 @@ import lodop from '@/utils/lodop'
export
default
{
filters
:
{
parseTime
}
,
props
:{
orderId
:
[
String
,
Number
]
orderId
:
[
String
,
Number
],
warehouseInNum
:
Number
}
,
data
(){
return
{
...
...
@@ -116,7 +117,9 @@ export default {
loadData
(){
printTag
(
this
.
orderId
).
then
(
res
=>
{
this
.
$set
(
this
,
'
tags
'
,
res
.
data
)
this
.
form
.
start
=
res
.
data
[
0
].
num
// this.form.start = res.data[0].num
// 起始标签为入仓数 + 1
this
.
form
.
start
=
this
.
warehouseInNum
+
1
this
.
form
.
end
=
res
.
data
[
res
.
data
.
length
-
1
].
num
}
)
}
,
...
...
@@ -126,9 +129,10 @@ export default {
this
.
$emit
(
'
close
'
);
}
,
showPreview
(){
/* 2023-07-17 要求不限制范围
if(this.form.end > this.tags[this.tags.length-1].num){
return this.$message.error(this.$t('结束标签不对'))
}
}
*/
if
(
!
this
.
printTags
.
length
){
return
this
.
$message
.
error
(
this
.
$t
(
'
指定区域无可打印标签
'
))
}
...
...
src/views/ecw/order/edit.vue
View file @
191c8a4a
...
...
@@ -224,7 +224,7 @@
<dict-selector
v-model=
"row.unit"
:type=
"DICT_TYPE.ECW_PACKAGING_TYPE"
defaultable
:disabled=
"!canAddProduct || !productEditable"
/>
</
template
>
</el-table-column>
<el-table-column
:label=
"
$t('数量') + '(个)'
"
width=
"120px"
>
<el-table-column
:label=
"
`${$t('数量')}(${$t('个')})`
"
width=
"120px"
>
<
template
slot-scope=
"{row}"
>
<el-input
v-model=
"row.quantity"
@
keyup.native=
"checkPositiveInterge(row, 'quantity')"
:disabled=
"!canAddProduct || !productEditable"
/>
</
template
>
...
...
@@ -407,7 +407,7 @@
<dict-selector
:type=
"DICT_TYPE.ECW_HARVEST_METHOD"
v-model=
"form.harvestMethod"
:filter=
"item => item.value == 1 || homeDeliveryService"
defaultable
:disabled=
"false"
/>
</el-form-item>
</div>
<div
v-if=
"homeDeliveryService &&
form.harvestMethod
== 2"
>
<div
v-if=
"homeDeliveryService &&
+form.harvestMethod =
== 2"
>
<el-form-item
:label=
"$t('收货地区')"
prop=
"country"
>
<area-selector
:country=
"form.consigneeVO ? form.consigneeVO.country : undefined"
...
...
@@ -497,17 +497,25 @@
<work-flow
xmlkey=
"order_modify"
v-model=
"ccIdArr"
/>
</el-card>
<el-form-item
label=
""
style=
"margin: 30px 0"
>
<div
style=
"margin: 30px 0; display: flex"
>
<!--返回按钮应该在表单被禁用的情况下也可以点击,所以需要用一个form来包裹以脱离原form的disabled控制-->
<el-form
inline
class=
"mr-10"
>
<el-button
@
click=
"$store.dispatch('tagsView/delCurrentView')"
>
{{$t('返回')}}
</el-button>
</el-form>
<
template
v-if=
"form.applyStatus == 1"
>
<el-button
type=
"primary"
@
click=
"$router.push('/bpm/process-instance/detail?id=' + form.formId)"
>
{{
$t
(
'
审核中
'
)
}}
</el-button>
</
template
>
<!--更新渠道的时候用一个form包裹按钮,脱离原form的disabled控制-->
<el-form
v-else-if=
"updateChannel"
inline
>
<el-button
type=
"primary"
@
click=
"submitForm(2)"
>
{{$t('编辑订单')}}
</el-button>
<!--修改-->
</el-form>
<
template
v-else
>
<el-button
type=
"primary"
@
click=
"submitForm(0)"
v-if=
"!form.status"
>
{{
$t
(
'
保存草稿
'
)
}}
</el-button>
<!--草稿-->
<el-button
type=
"primary"
@
click=
"submitForm(2)"
v-if=
"!form.orderId || !form.status"
>
{{
$t
(
'
新建订单
'
)
}}
</el-button>
<!--待入仓-->
<el-button
type=
"primary"
@
click=
"submitForm(2)"
v-else
>
{{
$t
(
'
编辑订单
'
)
}}
</el-button>
<!--修改-->
</
template
>
<el-button
@
click=
"$store.dispatch('tagsView/delCurrentView')"
>
{{$t('返回')}}
</el-button>
</el-form-item>
</div>
</el-form>
<el-dialog
:title=
"$t('批量导入')"
:visible.sync=
"showBatchImportDialog"
width=
"1000px"
:close-on-click-modal=
"false"
>
...
...
@@ -587,7 +595,8 @@ let makeDefaultFormData = () => {
isExternalWarehouse
:
false
,
externalWarehouseDtoList
:[],
orderItemVOList
:[],
drawee
:
2
drawee
:
2
,
harvestMethod
:
"
1
"
}
}
window
.
Decimal
=
Decimal
...
...
@@ -932,16 +941,20 @@ export default {
this
.
$set
(
this
,
'
showWorkFlow
'
,
true
)
}
},
'
$route.query.transportType
'
(
transportType
){
this
.
$set
(
this
.
form
,
'
transportId
'
,
+
transportType
)
}
/*
'$route.query.transportType'(transportType){
this.$set(this.form, 'transportId',
transportType ? +transportType : undefined
)
}
*/
},
activated
(){
if
(
this
.
$route
.
query
.
id
!=
this
.
form
.
id
){
this
.
getOrder
()
}
if
(
this
.
$route
.
query
.
transportType
!=
this
.
transportId
){
this
.
set
(
this
.
form
.
transportId
,
+
this
.
$route
.
query
.
transportType
||
null
)
let
transportType
=
undefined
if
(
this
.
$route
.
query
.
transportType
){
transportType
=
+
this
.
$route
.
query
.
transportType
}
if
(
transportType
!=
this
.
transportId
){
this
.
$set
(
this
.
form
,
'
transportId
'
,
transportType
)
}
// 变更出货渠道
...
...
@@ -978,7 +991,6 @@ export default {
})
}
},
methods
:
{
onTableMounted
(
e
){
...
...
src/views/ecw/order/index.vue
View file @
191c8a4a
...
...
@@ -454,7 +454,7 @@
exclude(scope.row.status, [0]) &&
exclude(scope.row.abnormalState, [5,6,7,8])
"
>
<el-dropdown-item
@
click.native=
"printTag
OrderId=scope.row.orderId
"
v-hasPermi=
"['ecw:order:print_tag']"
>
{{
$t
(
'
打印标签
'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click.native=
"printTag
(scope.row)
"
v-hasPermi=
"['ecw:order:print_tag']"
>
{{
$t
(
'
打印标签
'
)
}}
</el-dropdown-item>
</
template
>
<!-- 打印入仓单 -->
...
...
@@ -480,7 +480,7 @@
@
pagination=
"getList"
/>
<special-needs
:orderNo=
"orderNo"
:show.sync=
"isShow"
:currency=
"JSON.stringify(currencyList)"
:order-id=
"orderId"
@
determine=
"getList"
></special-needs>
<print-tag
v-if=
"printTagOrderId !== null"
:order-id=
"printTagOrderId"
@
close=
"printTagOrderId=null"
/>
<print-tag
v-if=
"printTagOrderId !== null"
:order-id=
"printTagOrderId"
@
close=
"printTagOrderId=null"
:warehouse-in-num=
"printTagWarehouseInNum"
/>
<print-warehouse-receipt
v-if=
"printWarehouseReceiptOrderId !== null"
:order-id=
"printWarehouseReceiptOrderId"
@
close=
"printWarehouseReceiptOrderId=null"
/>
<print-lading-bill
v-if=
"printLadingBillOrderId !== null"
:order-id=
"printLadingBillOrderId"
@
close=
"printLadingBillOrderId=null"
/>
<batch-pickup
v-if=
"showBatchPickup"
@
close=
"onBatchClose"
@
success=
"onBatchClose"
/>
...
...
@@ -592,6 +592,7 @@ export default {
dateFilter
:
[],
//筛选日期
printTagOrderId
:
null
,
// 显示打印标签的订单ID
printTagWarehouseInNum
:
0
,
// 打印标签的订单入仓箱数
printWarehouseReceiptOrderId
:
null
,
// 打印入仓单的订单ID
printLadingBillOrderId
:
null
,
// 打印提单的订单ID
showBatchPickup
:
false
,
// 是否显示批量提货弹窗
...
...
@@ -917,6 +918,11 @@ export default {
onBatchClose
(){
this
.
showBatchPickup
=
false
this
.
handleQuery
()
},
// 打印标签
printTag
(
order
){
this
.
printTagOrderId
=
order
.
orderId
this
.
printTagWarehouseInNum
=
order
.
sumNum
}
}
};
...
...
src/views/ecw/order/splitApply/index.vue
View file @
191c8a4a
...
...
@@ -1148,11 +1148,18 @@ export default {
})
this
.
currentPutIn
=
null
// 根据比例计算默认的收费方数和收费重量
const
orderItem
=
this
.
orderData
.
orderItemVOList
.
find
(
item
=>
item
.
orderItemId
==
this
.
shopForm
.
orderItemId
)
const
rate
=
this
.
putin
.
num
/
orderItem
.
warehouseInInfoVO
.
cartonsNum
this
.
$set
(
this
.
shopForm
,
'
chargeVolume
'
,
(
orderItem
.
chargeVolume
*
rate
).
toFixed
(
2
))
this
.
$set
(
this
.
shopForm
,
'
chargeWeight
'
,
(
orderItem
.
chargeWeight
*
rate
).
toFixed
(
2
))
/*
* 1 普货 2 重货 3 泡货
* 普货 收费数据=入仓数据
* 泡货 收费方数=入仓方数 收费重量 = 品名收费重量*比例
* 重货 收费方数=品名收费方数*比例 收费重量 = 入仓重量
* */
const
chargeVolume
=
orderItem
.
itemType
===
2
?
(
orderItem
.
chargeVolume
*
rate
).
toFixed
(
2
)
:
this
.
putin
.
volume
const
chargeWeight
=
orderItem
.
itemType
===
3
?
(
orderItem
.
chargeWeight
*
rate
).
toFixed
(
2
)
:
this
.
putin
.
weight
this
.
$set
(
this
.
shopForm
,
'
chargeVolume
'
,
chargeVolume
)
this
.
$set
(
this
.
shopForm
,
'
chargeWeight
'
,
chargeWeight
)
this
.
$set
(
this
.
shopForm
,
'
worth
'
,
(
orderItem
.
worth
*
rate
).
toFixed
(
2
))
},
// 清空放入记录
...
...
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @
191c8a4a
...
...
@@ -65,7 +65,7 @@
</el-col>
<el-col
:span=
"16"
>
<el-form-item
:label=
"$t('入仓特性')"
style=
"margin-top: 20px"
>
<el-checkbox-group
v-model=
"form.
p
rodAttrIds"
>
<el-checkbox-group
v-model=
"form.
warehouseInP
rodAttrIds"
>
<el-checkbox
v-for=
"item in attrList"
:key=
"item.id"
:label=
"item.id"
>
{{ item.attrName }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
...
...
@@ -269,7 +269,7 @@
</el-col>
<el-col
:span=
"16"
>
<el-form-item
:label=
"$t('入仓特性')"
style=
"margin-top: 20px"
>
<el-checkbox-group
v-model=
"form1.
p
rodAttrIds"
>
<el-checkbox-group
v-model=
"form1.
warehouseInP
rodAttrIds"
>
<el-checkbox
v-for=
"item in attrList"
:key=
"item.id"
:label=
"item.id"
>
{{ item.attrName }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
...
...
@@ -638,7 +638,7 @@ export default {
inTime
:
undefined
,
material
:
undefined
,
orderItemId
:
undefined
,
p
rodAttrIds
:
[],
warehouseInP
rodAttrIds
:
[],
prodId
:
undefined
,
prodTitleEn
:
undefined
,
prodTitleZh
:
undefined
,
...
...
@@ -657,7 +657,7 @@ export default {
inTime
:
undefined
,
material
:
undefined
,
orderItemId
:
undefined
,
p
rodAttrIds
:
[],
warehouseInP
rodAttrIds
:
[],
prodId
:
undefined
,
prodTitleEn
:
undefined
,
prodTitleZh
:
undefined
,
...
...
@@ -728,7 +728,10 @@ export default {
this
.
form
.
orderId
=
this
.
warehousing
.
orderId
this
.
form
.
orderItemId
=
this
.
warehousing
.
orderItemId
this
.
form
.
orderNo
=
this
.
warehousing
.
orderNo
this
.
form
.
prodAttrIds
=
this
.
warehousing
.
prodAttrIds
?.
split
(
'
,
'
).
map
(
e
=>
+
e
)
||
[]
this
.
form
.
warehouseInProdAttrIds
=
this
.
warehousing
.
warehouseInProdAttrIds
?.
split
(
'
,
'
).
map
(
e
=>
+
e
)
||
this
.
warehousing
.
prodAttrIds
?.
split
(
'
,
'
).
map
(
e
=>
+
e
)
||
[]
this
.
form
.
prodId
=
this
.
warehousing
.
prodId
this
.
form
.
prodTitleEn
=
this
.
warehousing
.
prodTitleEn
this
.
form
.
prodTitleZh
=
this
.
warehousing
.
prodTitleZh
...
...
@@ -784,7 +787,7 @@ export default {
handleSubmit
()
{
if
(
this
.
activeName
!==
"
first
"
){
// 添加非填单货物
if
(
this
.
form1
.
p
rodAttrIds
.
indexOf
(
4
)
!==
-
1
)
{
if
(
this
.
form1
.
warehouseInP
rodAttrIds
.
indexOf
(
4
)
!==
-
1
)
{
return
this
.
$notify
({
title
:
this
.
$t
(
'
提示
'
),
message
:
this
.
$t
(
"
订单包含不接受货物,请检查
"
),
...
...
@@ -802,7 +805,7 @@ export default {
orderId
:
this
.
warehousing
.
orderId
,
orderItemId
:
undefined
,
orderNo
:
this
.
warehousing
.
orderNo
,
prodAttrIds
:
this
.
form
.
p
rodAttrIds
.
join
(
'
,
'
),
warehouseInProdAttrIds
:
this
.
form
.
warehouseInP
rodAttrIds
.
join
(
'
,
'
),
orderWarehouseInItemDoList
:
this
.
form1
.
table
.
map
(
e
=>
{
return
{
...
e
,
...
...
@@ -821,7 +824,7 @@ export default {
})
})
}
else
{
if
(
this
.
form
.
p
rodAttrIds
.
indexOf
(
4
)
!==
-
1
)
{
if
(
this
.
form
.
warehouseInP
rodAttrIds
.
indexOf
(
4
)
!==
-
1
)
{
return
this
.
$notify
({
title
:
this
.
$t
(
'
提示
'
),
message
:
this
.
$t
(
"
订单包含不接受货物,请检查
"
),
...
...
@@ -845,7 +848,7 @@ export default {
volume
:
(
+
this
.
warehousing
.
volume
)?.
toFixed
(
2
)
||
''
,
weight
:
(
+
this
.
warehousing
.
weight
)?.
toFixed
(
2
)
||
''
,
prodId
:
this
.
form
.
prodId
,
prodAttrIds
:
this
.
form
.
p
rodAttrIds
.
join
(
'
,
'
),
warehouseInProdAttrIds
:
this
.
form
.
warehouseInP
rodAttrIds
.
join
(
'
,
'
),
"
orderWarehouseInUpdateItemDoList
"
:
this
.
form
.
table
.
map
(
e
=>
{
return
{
...
e
,
...
...
@@ -871,7 +874,7 @@ export default {
orderItemId
:
this
.
warehousing
.
orderItemId
,
orderNo
:
this
.
warehousing
.
orderNo
,
isAppend
:
this
.
isAdd
?
true
:
undefined
,
prodAttrIds
:
this
.
form
.
p
rodAttrIds
.
join
(
'
,
'
),
warehouseInProdAttrIds
:
this
.
form
.
warehouseInP
rodAttrIds
.
join
(
'
,
'
),
orderWarehouseInItemDoList
:
this
.
form
.
table
.
map
(
e
=>
{
return
{
...
e
,
...
...
@@ -910,13 +913,13 @@ export default {
this
.
form
.
prodTitleZh
=
product
.
titleZh
this
.
form
.
prodTitleEn
=
product
.
titleEn
this
.
handleBrandChange
(
parseInt
(
this
.
form
.
brand
))
this
.
form
.
p
rodAttrIds
=
product
.
attrId
?
product
.
attrId
.
split
(
'
,
'
).
map
(
e
=>
+
e
)
:
[]
this
.
form
.
warehouseInP
rodAttrIds
=
product
.
attrId
?
product
.
attrId
.
split
(
'
,
'
).
map
(
e
=>
+
e
)
:
[]
},
onProductChange1
(
product
){
this
.
form1
.
prodTitleZh
=
product
.
titleZh
this
.
form1
.
prodTitleEn
=
product
.
titleEn
this
.
handleBrandChange
(
parseInt
(
this
.
form1
.
brand
))
this
.
form1
.
p
rodAttrIds
=
product
.
attrId
?
product
.
attrId
.
split
(
'
,
'
).
map
(
e
=>
+
e
)
:
[]
this
.
form1
.
warehouseInP
rodAttrIds
=
product
.
attrId
?
product
.
attrId
.
split
(
'
,
'
).
map
(
e
=>
+
e
)
:
[]
},
getProductBrandPage
(
titleZh
=
undefined
)
{
getProductBrankPage
({
pageSize
:
20
,
titleZh
}).
then
(
r
=>
{
...
...
@@ -1011,10 +1014,10 @@ export default {
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
新增成功
"
))
if
(
this
.
activeName
===
'
first
'
)
{
this
.
form
.
prodId
=
response
.
data
this
.
form
.
p
rodAttrIds
=
this
.
productForm
.
attrArray
this
.
form
.
warehouseInP
rodAttrIds
=
this
.
productForm
.
attrArray
}
else
{
this
.
form1
.
prodId
=
response
.
data
this
.
form1
.
p
rodAttrIds
=
this
.
productForm
.
attrArray
this
.
form1
.
warehouseInP
rodAttrIds
=
this
.
productForm
.
attrArray
}
this
.
productCancel
()
})
...
...
src/views/ecw/warehouse/index.vue
View file @
191c8a4a
...
...
@@ -307,12 +307,12 @@
</el-checkbox-group>
</el-form-item>
<el-form-item
v-if=
"['3','4'].includes(lineform.transportType)"
label=
"空运提单制作节点"
>
<el-select
v-model=
"l
ading
form.makeBillNode"
>
<el-select
v-model=
"l
ine
form.makeBillNode"
>
<el-option
v-show=
"item.value !== '1'"
v-for=
"(item, index) in getDictDatas(DICT_TYPE.AIR_SHIPMENT_PROCESS)"
:label=
"$l(item, 'label')"
:value=
"item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"线路是否在客户端显示"
>
<el-radio-group
v-model=
"l
ading
form.isClientShow"
>
<el-radio-group
v-model=
"l
ine
form.isClientShow"
>
<el-radio
:label=
"1"
>
可见
</el-radio>
<el-radio
:label=
"0"
>
不可见
</el-radio>
</el-radio-group>
...
...
@@ -533,8 +533,8 @@ export default {
},
// 表单参数
form
:
{
checkList
:[],},
ladingform
:
{
prefixCounter
:
null
,
titleZh
:
null
,
contentZh
:
null
,
account
:
null
,
acctArr
:[]
,
isClientShow
:
1
,
makeBillNode
:
''
},
lineform
:
{
otherService
:[],},
ladingform
:
{
prefixCounter
:
null
,
titleZh
:
null
,
contentZh
:
null
,
account
:
null
,
acctArr
:[]},
lineform
:
{
otherService
:[],
isClientShow
:
1
,
makeBillNode
:
'
2
'
},
startName
:
''
,
destName
:
''
,
...
...
@@ -846,6 +846,8 @@ export default {
this
.
serviceOpen
=
true
;
this
.
lineform
.
lineId
=
row
.
lineId
;
this
.
lineform
.
transportType
=
row
.
transportType
;
this
.
lineform
.
isClientShow
=
row
.
isClientShow
;
this
.
lineform
.
makeBillNode
=
row
.
makeBillNode
;
},
submitLineForm
()
{
...
...
@@ -856,7 +858,9 @@ export default {
}
serviceConfig
({
lineId
:
this
.
lineform
.
lineId
,
otherService
:
otherService
.
join
(
'
,
'
)
otherService
:
otherService
.
join
(
'
,
'
),
isClientShow
:
this
.
lineform
.
isClientShow
,
makeBillNode
:
this
.
lineform
.
makeBillNode
}).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
操作成功
"
));
...
...
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