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
ea5939ab
Commit
ea5939ab
authored
Apr 09, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复出货的一些bug
parent
67c34519
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
indexSea.vue
src/views/ecw/box/indexSea.vue
+1
-1
startPacking.vue
...ews/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
+1
-1
subMaterial.vue
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
+3
-3
index.vue
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
+1
-1
No files found.
src/views/ecw/box/indexSea.vue
View file @
ea5939ab
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
{{
$t
(
'
操作
'
)
}}
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
{{
$t
(
'
操作
'
)
}}
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
</el-button>
</el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
:disabled=
"scope.row.ldStatus>=46"
command=
"edit"
v-hasPermi=
"['shipment:box:
sea:edit
']"
>
{{
$t
(
'
编辑
'
)
}}
</el-dropdown-item>
<el-dropdown-item
:disabled=
"scope.row.ldStatus>=46"
command=
"edit"
v-hasPermi=
"['shipment:box:
update
']"
>
{{
$t
(
'
编辑
'
)
}}
</el-dropdown-item>
<el-dropdown-item
command=
"sea"
v-hasPermi=
"['shipment:box:action:sea']"
>
{{
$t
(
'
操作-海运
'
)
}}
</el-dropdown-item>
<el-dropdown-item
command=
"sea"
v-hasPermi=
"['shipment:box:action:sea']"
>
{{
$t
(
'
操作-海运
'
)
}}
</el-dropdown-item>
<el-dropdown-item
command=
"error"
v-hasPermi=
"['shipment:box:action:error']"
>
{{
$t
(
'
异常登记
'
)
}}
</el-dropdown-item>
<el-dropdown-item
command=
"error"
v-hasPermi=
"['shipment:box:action:error']"
>
{{
$t
(
'
异常登记
'
)
}}
</el-dropdown-item>
<el-dropdown-item
command=
"cost"
v-hasPermi=
"['shipment:box:action:cost']"
>
{{
$t
(
'
费用登记
'
)
}}
</el-dropdown-item>
<el-dropdown-item
command=
"cost"
v-hasPermi=
"['shipment:box:action:cost']"
>
{{
$t
(
'
费用登记
'
)
}}
</el-dropdown-item>
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @
ea5939ab
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
<!-- 修改柜信息 -->
<!-- 修改柜信息 -->
<
template
v-if=
"dialogConfig.type === 'modifyCabinet' && dialogConfig.dialogVisible"
>
<
template
v-if=
"dialogConfig.type === 'modifyCabinet' && dialogConfig.dialogVisible"
>
<el-form
ref=
"modifyForm"
:rules=
"rules"
:model=
"modifyCabinetObj"
label-width=
"80px"
>
<el-form
ref=
"modifyForm"
:rules=
"rules"
:model=
"modifyCabinetObj"
label-width=
"80px"
>
<el-form-item
:label=
"$t('起运仓库')"
prop=
"startWarehouseId"
>
<el-form-item
v-if=
"false"
:label=
"$t('起运仓库')"
prop=
"startWarehouseId"
>
<el-select
v-model=
"modifyCabinetObj.startWarehouseId"
:placeholder=
"$t('请选择仓库')"
filterable
>
<el-select
v-model=
"modifyCabinetObj.startWarehouseId"
:placeholder=
"$t('请选择仓库')"
filterable
>
<el-option
v-for=
"warehouse in $attrs.warehouseList"
:key=
"warehouse.id"
:label=
"$l(warehouse, 'title')"
:value=
"warehouse.id"
></el-option>
<el-option
v-for=
"warehouse in $attrs.warehouseList"
:key=
"warehouse.id"
:label=
"$l(warehouse, 'title')"
:value=
"warehouse.id"
></el-option>
</el-select>
</el-select>
...
...
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue
View file @
ea5939ab
...
@@ -23,11 +23,11 @@
...
@@ -23,11 +23,11 @@
<ladingSelect
v-model=
"subMaterialObj.shipperId"
:placeholder=
"$t('请选择托运人')"
:allUsers=
"this.$attrs.allLading"
/>
<ladingSelect
v-model=
"subMaterialObj.shipperId"
:placeholder=
"$t('请选择托运人')"
:allUsers=
"this.$attrs.allLading"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
>
<el-form-item
:label=
"$t('收货人')"
>
<el-input
v-model=
"subMaterialObj.consigneeName"
></el-input>
<el-input
v-model=
"subMaterialObj.consigneeName"
readonly
></el-input>
<!--
<userSelect
v-model=
"subMaterialObj.consigneeId"
:placeholder=
"$t('请选择收货人')"
:allUsers=
"this.$attrs.allUsers"
/>
-->
<!--
<userSelect
v-model=
"subMaterialObj.consigneeId"
:placeholder=
"$t('请选择收货人')"
:allUsers=
"this.$attrs.allUsers"
/>
-->
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('通知方')"
>
<el-form-item
:label=
"$t('通知方')"
>
<el-input
v-model=
"subMaterialObj.notifyingName"
></el-input>
<el-input
v-model=
"subMaterialObj.notifyingName"
readonly
></el-input>
<!--
<userSelect
v-model=
"subMaterialObj.notifyingId"
:placeholder=
"$t('请选择通知方')"
:allUsers=
"this.$attrs.allUsers"
/>
-->
<!--
<userSelect
v-model=
"subMaterialObj.notifyingId"
:placeholder=
"$t('请选择通知方')"
:allUsers=
"this.$attrs.allUsers"
/>
-->
</el-form-item>
</el-form-item>
<el-form-item
label=
"Mark & No."
>
<el-form-item
label=
"Mark & No."
>
...
@@ -180,7 +180,7 @@ export default {
...
@@ -180,7 +180,7 @@ export default {
},
},
download
()
{
download
()
{
getBoxLadingBillPdf
({
shipmentId
:
this
.
shipmentObj
.
id
}).
then
(
res
=>
{
getBoxLadingBillPdf
({
shipmentId
:
this
.
shipmentObj
.
id
}).
then
(
res
=>
{
let
blob
=
new
Blob
([
res
],
{
type
:
"
application/
pdf
"
})
let
blob
=
new
Blob
([
res
],
{
type
:
"
application/
vnd.ms-excel
"
})
FileSaver
.
saveAs
(
blob
,
this
.
$t
(
'
提单确认件
'
));
FileSaver
.
saveAs
(
blob
,
this
.
$t
(
'
提单确认件
'
));
})
})
}
}
...
...
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @
ea5939ab
...
@@ -164,7 +164,7 @@ export default {
...
@@ -164,7 +164,7 @@ export default {
list
.
push
({
list
.
push
({
...
oItem
,
...
oItem
,
warehouseInInfo
,
warehouseInInfo
,
multiSpecification
:
item
.
multiSpecification
,
//
multiSpecification: item.multiSpecification,
positionNo
:
oItem
.
positionNo
,
positionNo
:
oItem
.
positionNo
,
tallyStatus
:
item
.
tallyStatus
,
tallyStatus
:
item
.
tallyStatus
,
tallyTime
:
item
.
tallyTime
,
tallyTime
:
item
.
tallyTime
,
...
...
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