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
3f8f81b9
Commit
3f8f81b9
authored
Sep 11, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
空运审核优化
parent
62c7748b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
detail.vue
src/views/bpm/processInstance/detail.vue
+13
-1
shippingDetail.vue
src/views/ecw/box/shippingDetail.vue
+3
-3
No files found.
src/views/bpm/processInstance/detail.vue
View file @
3f8f81b9
...
...
@@ -432,7 +432,19 @@ export default {
shipment_order_sorting
:
{
component
:
"
shippingDetail
"
,
processId
:
this
.
processInstance
.
businessKey
}
},
// 空运到仓审核
air_warehouse
:
{
component
:
"
shippingDetail
"
,
processId
:
this
.
processInstance
.
businessKey
,
type
:
'
air_warehouse
'
},
// 空运到仓审核
air_warehouse_no
:
{
component
:
"
shippingDetail
"
,
processId
:
this
.
processInstance
.
businessKey
,
type
:
'
air_warehouse
'
},
}
console
.
log
(
'
formCustomViewPath
'
,
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
())
return
map
[
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
()]
...
...
src/views/ecw/box/shippingDetail.vue
View file @
3f8f81b9
...
...
@@ -9,7 +9,7 @@
<el-descriptions-item
:label=
"$t('出货渠道')"
>
{{
getShipChannelName
(
boxBackVO
.
shippingChannelId
)
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('柜型')"
>
<el-descriptions-item
v-if=
"type!='air_warehouse'"
:label=
"$t('柜型')"
>
{{
cabinetLabel
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('体积/重量')"
>
...
...
@@ -77,7 +77,7 @@
<!-- <el-descriptions-item :label="$t('出货渠道')">
{{getShipChannelName(boxBackVO.shippingChannelId)}}
</el-descriptions-item> -->
<el-descriptions-item
:label=
"$t('柜型')"
>
<el-descriptions-item
v-if=
"type!='air_warehouse'"
:label=
"$t('柜型')"
>
{{cabinetLabel}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('体积') + '/' + $t('重量')"
>
...
...
@@ -119,7 +119,7 @@
<el-table-column
prop=
"installNum"
:label=
"$t('实装箱数')"
align=
"center"
></el-table-column>
<el-table-column
prop=
"volume"
label=
"体积m³"
align=
"center"
></el-table-column>
<el-table-column
prop=
"weight"
:label=
"$t('重量')"
align=
"center"
></el-table-column>
<el-table-column
prop=
"unloadNum"
:label=
"$t('卸柜箱数')"
align=
"center"
v-if=
"isShowColumn(boxBackVO)"
></el-table-column>
<el-table-column
prop=
"unloadNum"
:label=
"
type=='air_warehouse'?$t('到仓箱数'):
$t('卸柜箱数')"
align=
"center"
v-if=
"isShowColumn(boxBackVO)"
></el-table-column>
</el-table>
</el-row>
</el-dialog>
...
...
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