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
cd9e470b
Commit
cd9e470b
authored
Sep 06, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审核中理货,合包,出货,出仓,代理,报关,提单禁用提交
parent
cb94ee59
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
15 deletions
+19
-15
checkout.vue
src/views/ecw/box/shippingAir/nodePage/checkout.vue
+2
-2
cusDeclaration.vue
src/views/ecw/box/shippingAir/nodePage/cusDeclaration.vue
+1
-1
index.vue
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
+4
-3
shipment.vue
src/views/ecw/box/shippingAir/nodePage/shipment.vue
+1
-1
subMaterial.vue
src/views/ecw/box/shippingAir/nodePage/subMaterial.vue
+3
-3
index.vue
src/views/ecw/box/shippingAir/nodePage/tally/index.vue
+8
-5
No files found.
src/views/ecw/box/shippingAir/nodePage/checkout.vue
View file @
cd9e470b
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
<el-row
class=
"operate-button"
>
<el-row
class=
"operate-button"
>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
>
{{
$t
(
'
保存
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
>
{{
$t
(
'
保存
'
)
}}
</el-button>
<el-button
type=
"success"
@
click=
"onSubmit(2)"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
<el-button
:disabled=
"$attrs.shipmentObj.approvaling"
type=
"success"
@
click=
"onSubmit(2)"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
<el-button
@
click=
"cancel"
>
{{
$t
(
'
关闭
'
)
}}
</el-button>
<el-button
@
click=
"cancel"
>
{{
$t
(
'
关闭
'
)
}}
</el-button>
</el-row>
</el-row>
</div>
</div>
...
...
src/views/ecw/box/shippingAir/nodePage/cusDeclaration.vue
View file @
cd9e470b
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
<el-row
class=
"operate-button"
>
<el-row
class=
"operate-button"
>
<el-button
type=
"primary"
v-if=
"inOverReview"
plain
@
click=
"canclOverAudit"
>
{{$t('取消删单退场审核')}}
</el-button>
<el-button
type=
"primary"
v-if=
"inOverReview"
plain
@
click=
"canclOverAudit"
>
{{$t('取消删单退场审核')}}
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
:disabled=
"isCheckDeal('submit')"
>
{{$t('保存')}}
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
:disabled=
"isCheckDeal('submit')"
>
{{$t('保存')}}
</el-button>
<el-button
type=
"success"
v-if=
"!inReview&&!inOverReview"
@
click=
"onSubmit(2)"
:disabled=
"isCheckDeal('submit')"
>
{{$t('提交')}}
</el-button>
<el-button
type=
"success"
v-if=
"!inReview&&!inOverReview"
@
click=
"onSubmit(2)"
:disabled=
"isCheckDeal('submit')
|| shipmentObj.approvaling
"
>
{{$t('提交')}}
</el-button>
<el-button
@
click=
"cancel"
>
{{$t('关闭')}}
</el-button>
<el-button
@
click=
"cancel"
>
{{$t('关闭')}}
</el-button>
<el-button
type=
"primary"
@
click=
"extraCost"
v-show=
"cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'"
>
{{$t('额外费用')}}
</el-button>
<el-button
type=
"primary"
@
click=
"extraCost"
v-show=
"cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'"
>
{{$t('额外费用')}}
</el-button>
<!-- <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button> -->
<!-- <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button> -->
...
...
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
View file @
cd9e470b
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
<el-button
<el-button
size=
"small"
size=
"small"
type=
"primary"
type=
"primary"
:disabled=
"shipmentObj.approvaling"
@
click=
"
@
click=
"
addMergedialogVisible = true
addMergedialogVisible = true
isMergeEdit = false
isMergeEdit = false
...
@@ -57,8 +58,8 @@
...
@@ -57,8 +58,8 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('操作')"
align=
"center"
width=
"260"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<el-table-column
:label=
"$t('操作')"
align=
"center"
width=
"260"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
v-if=
"scope.row.status == 1"
type=
"text"
size=
"small"
@
click=
"editMerge(scope.row)"
>
{{
$t
(
'
编辑
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
v-if=
"scope.row.status == 1"
type=
"text"
size=
"small"
@
click=
"editMerge(scope.row)"
>
{{
$t
(
'
编辑
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"small"
@
click=
"pkgPage(scope.row)"
>
{{
$t
(
'
装箱
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
type=
"text"
size=
"small"
@
click=
"pkgPage(scope.row)"
>
{{
$t
(
'
装箱
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status != 2"
type=
"text"
size=
"small"
@
click=
"deleteMerge(scope.row.id)"
>
{{
$t
(
'
删除
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status != 2"
type=
"text"
size=
"small"
@
click=
"deleteMerge(scope.row.id)"
>
{{
$t
(
'
删除
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"small"
@
click=
"printTag(scope.row.id)"
>
{{
$t
(
'
打印标签
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"small"
@
click=
"printTag(scope.row.id)"
>
{{
$t
(
'
打印标签
'
)
}}
</el-button>
</
template
>
</
template
>
...
@@ -115,7 +116,7 @@
...
@@ -115,7 +116,7 @@
</el-dialog>
</el-dialog>
<el-row
style=
"margin-top: 15px"
class=
"operate-button"
>
<el-row
style=
"margin-top: 15px"
class=
"operate-button"
>
<el-button
size=
"small"
type=
"primary"
@
click=
"finish"
>
{{ $t('完成') }}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
size=
"small"
type=
"primary"
@
click=
"finish"
>
{{ $t('完成') }}
</el-button>
<el-button
size=
"small"
@
click=
"$emit('closeDialog')"
>
{{ $t('取消') }}
</el-button>
<el-button
size=
"small"
@
click=
"$emit('closeDialog')"
>
{{ $t('取消') }}
</el-button>
</el-row>
</el-row>
</el-col>
</el-col>
...
...
src/views/ecw/box/shippingAir/nodePage/shipment.vue
View file @
cd9e470b
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
<el-button
v-if=
"airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1"
type=
"primary"
@
click=
"$router.push(
{path: '/bpm/process-instance/detail', query: {id: airShipmentApprovalInfo.bpmProcessId}})">
{{
$t
(
'
出货审核中
'
)
}}
</el-button>
<el-button
v-if=
"airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1"
type=
"primary"
@
click=
"$router.push(
{path: '/bpm/process-instance/detail', query: {id: airShipmentApprovalInfo.bpmProcessId}})">
{{
$t
(
'
出货审核中
'
)
}}
</el-button>
<el-button
v-if=
"airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1"
type=
"primary"
@
click=
"canclAudit"
>
{{
$t
(
'
取消出货审核
'
)
}}
</el-button>
<el-button
v-if=
"airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1"
type=
"primary"
@
click=
"canclAudit"
>
{{
$t
(
'
取消出货审核
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
>
{{
$t
(
'
保存
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
>
{{
$t
(
'
保存
'
)
}}
</el-button>
<el-button
v-if=
"!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1"
type=
"success"
@
click=
"onSubmit(2)"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
<el-button
:disabled=
"$attrs.shipmentObj.approvaling"
v-if=
"!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1"
type=
"success"
@
click=
"onSubmit(2)"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
<el-button
@
click=
"cancel"
>
{{
$t
(
'
关闭
'
)
}}
</el-button>
<el-button
@
click=
"cancel"
>
{{
$t
(
'
关闭
'
)
}}
</el-button>
</el-row>
</el-row>
</div>
</div>
...
...
src/views/ecw/box/shippingAir/nodePage/subMaterial.vue
View file @
cd9e470b
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
<el-row
class=
"operate-button"
>
<el-row
class=
"operate-button"
>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
>
{{
$t
(
'
保存
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"onSubmit(1)"
>
{{
$t
(
'
保存
'
)
}}
</el-button>
<el-button
type=
"success"
@
click=
"onSubmit(2)"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
type=
"success"
@
click=
"onSubmit(2)"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
<el-button
@
click=
"cancel"
>
{{
$t
(
'
关闭
'
)
}}
</el-button>
<el-button
@
click=
"cancel"
>
{{
$t
(
'
关闭
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.ladingBillInfo == null"
@
click=
"download"
>
{{
$t
(
'
下载提单确认件
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.ladingBillInfo == null"
@
click=
"download"
>
{{
$t
(
'
下载提单确认件
'
)
}}
</el-button>
</el-row>
</el-row>
...
...
src/views/ecw/box/shippingAir/nodePage/tally/index.vue
View file @
cd9e470b
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
<el-row
style=
"margin-top: 15px"
>
<el-row
style=
"margin-top: 15px"
>
<el-row>
<el-row>
<el-button
size=
"small"
type=
"primary"
@
click=
"()=>tallyClick('batch')"
>
{{
$t
(
'
批量理货
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
size=
"small"
type=
"primary"
@
click=
"()=>tallyClick('batch')"
>
{{
$t
(
'
批量理货
'
)
}}
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"()=>removeClick('batch')"
>
{{
$t
(
'
批量移出
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
size=
"small"
type=
"primary"
@
click=
"()=>removeClick('batch')"
>
{{
$t
(
'
批量移出
'
)
}}
</el-button>
</el-row>
</el-row>
<el-row
style=
"margin-top: 5px"
>
<el-row
style=
"margin-top: 5px"
>
<el-table
border
:data=
"tallyList"
@
select=
"checkboxSelect"
@
select-all=
"checkboxSelect"
max-height=
"600px"
>
<el-table
border
:data=
"tallyList"
@
select=
"checkboxSelect"
@
select-all=
"checkboxSelect"
max-height=
"600px"
>
...
@@ -93,8 +93,8 @@
...
@@ -93,8 +93,8 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('操作')"
align=
"center"
width=
"160"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<el-table-column
:label=
"$t('操作')"
align=
"center"
width=
"160"
class-name=
"small-padding fixed-width"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
size=
"small"
@
click=
"tallyClick('single',scope.row)"
>
{{
$t
(
'
理货
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
type=
"text"
size=
"small"
@
click=
"tallyClick('single',scope.row)"
>
{{
$t
(
'
理货
'
)
}}
</el-button>
<el-button
type=
"text"
size=
"small"
@
click=
"removeClick('single',scope.row)"
>
{{
$t
(
'
移出
'
)
}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
type=
"text"
size=
"small"
@
click=
"removeClick('single',scope.row)"
>
{{
$t
(
'
移出
'
)
}}
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
</el-row>
</el-row>
<el-row
style=
"margin-top: 15px"
class=
"operate-button"
>
<el-row
style=
"margin-top: 15px"
class=
"operate-button"
>
<el-button
size=
"small"
type=
"primary"
@
click=
"tallyFinish"
>
{{$t('完成理货')}}
</el-button>
<el-button
:disabled=
"shipmentObj.approvaling"
size=
"small"
type=
"primary"
@
click=
"tallyFinish"
>
{{$t('完成理货')}}
</el-button>
<el-button
size=
"small"
@
click=
"cancel"
>
{{$t('取消')}}
</el-button>
<el-button
size=
"small"
@
click=
"cancel"
>
{{$t('取消')}}
</el-button>
</el-row>
</el-row>
</el-col>
</el-col>
...
@@ -203,6 +203,9 @@ export default {
...
@@ -203,6 +203,9 @@ export default {
},
},
// 理货点击
// 理货点击
tallyClick
(
type
,
data
)
{
tallyClick
(
type
,
data
)
{
if
(
this
.
shipmentObj
.
approvaling
){
return
this
.
$message
.
error
(
this
.
$t
(
'
业务待审核,暂不能操作
'
))
}
if
(
type
===
"
batch
"
)
{
if
(
type
===
"
batch
"
)
{
if
(
this
.
selectedRows
.
length
===
0
)
{
if
(
this
.
selectedRows
.
length
===
0
)
{
this
.
$message
.
error
(
this
.
$t
(
"
请选择需要理货的订单
"
));
this
.
$message
.
error
(
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