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
1d040bb3
Commit
1d040bb3
authored
Sep 26, 2022
by
huhaiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拆单开发
parent
6b5ab41c
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
233 additions
and
245 deletions
+233
-245
boxSea.js
src/api/ecw/boxSea.js
+14
-0
index.vue
src/views/ecw/box/ladingBill/index.vue
+5
-1
splitOrder.vue
...views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
+188
-239
startPacking.vue
...ews/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
+2
-2
review.vue
src/views/ecw/box/shippingSea/nodePage/review.vue
+24
-3
No files found.
src/api/ecw/boxSea.js
View file @
1d040bb3
...
@@ -610,6 +610,20 @@ export function boxUpdate(data) {
...
@@ -610,6 +610,20 @@ export function boxUpdate(data) {
});
});
}
}
/**
* 拆单审核
*
* @param {*} params
* @returns
*/
export
function
createApproval
(
data
)
{
return
request
({
url
:
"
/ecw/box-approval/create
"
,
method
:
"
post
"
,
data
,
});
}
/***************************** 装柜 end **********************************/
/***************************** 装柜 end **********************************/
/***************************** 卸柜 start **********************************/
/***************************** 卸柜 start **********************************/
...
...
src/views/ecw/box/ladingBill/index.vue
View file @
1d040bb3
...
@@ -175,7 +175,11 @@ export default {
...
@@ -175,7 +175,11 @@ export default {
this.$set(this.dialogCfg, "visible", true);
this.$set(this.dialogCfg, "visible", true);
},
},
makeBill(row) {
makeBill(row) {
makeBillService({ orderId: row.orderId }).then((res) => {
const { bookSeaInfo } = this.shipmentObj;
makeBillService({
orderId: row.orderId,
zgDate: bookSeaInfo.sailTime,
}).then((res) => {
const { data } = res;
const { data } = res;
const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
let billContent = `
$
{
titleZh
}
$
{
contentZh
}
`,
let billContent = `
$
{
titleZh
}
$
{
contentZh
}
`,
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @
1d040bb3
This diff is collapsed.
Click to expand it.
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @
1d040bb3
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
size=
"small"
@
click=
"moveOut(scope.row)"
v-if=
"!isUnderReview && scope.row.installNum === 0"
>
移出
</el-button>
<el-button
type=
"text"
size=
"small"
@
click=
"moveOut(scope.row)"
v-if=
"!isUnderReview && scope.row.installNum === 0"
>
移出
</el-button>
<
!--
<el-button
type=
"text"
size=
"small"
v-if=
"isShowSplitOrder(scope.row)"
@
click=
"handlerSplitOrder(scope.row, 'splitOrder','拆单')"
>
拆单
</el-button>
--
>
<
el-button
type=
"text"
size=
"small"
v-if=
"isShowSplitOrder(scope.row)"
@
click=
"handlerSplitOrder(scope.row, 'splitOrder','拆单')"
>
拆单
</el-button
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -194,7 +194,7 @@
...
@@ -194,7 +194,7 @@
</el-row>
</el-row>
</
template
>
</
template
>
<!-- 拆单 -->
<!-- 拆单 -->
<splitOrder
v-if=
"dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible"
:currRow=
"currRow"
@
closeDialog=
"closeDialog"
/>
<splitOrder
v-
bind=
"$attrs"
:shipmentObj=
"shipmentObj"
v-
if=
"dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible"
:currRow=
"currRow"
@
closeDialog=
"closeDialog"
/>
</el-dialog>
</el-dialog>
</div>
</div>
</template>
</template>
...
...
src/views/ecw/box/shippingSea/nodePage/review.vue
View file @
1d040bb3
...
@@ -2,11 +2,12 @@
...
@@ -2,11 +2,12 @@
<div>
<div>
<el-form
ref=
"reviewForm"
:model=
"reviewObj"
label-width=
"120px"
>
<el-form
ref=
"reviewForm"
:model=
"reviewObj"
label-width=
"120px"
>
<el-form-item
label=
"申请理由"
>
<el-form-item
label=
"申请理由"
>
<el-input
v-model=
"reviewObj.applyReason"
type=
"textarea"
rows=
"2"
placeholder=
"请输入申请理由"
></el-input>
<el-input
v-model=
"reviewObj.applyReason"
type=
"textarea"
rows=
"2"
placeholder=
"请输入申请理由"
:disabled=
"isReview"
></el-input>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<el-row
class=
"operate-button"
>
<el-row
class=
"operate-button"
>
<el-button
type=
"success"
@
click=
"onSubmit"
>
发起申请
</el-button>
<el-button
type=
"success"
@
click=
"onSubmit"
:disabled=
"isReview"
>
发起申请
</el-button>
<el-button
type=
"primary"
@
click=
"jumpReviewDetail"
:disabled=
"!isReview"
>
审核中
</el-button>
<el-button
@
click=
"cancel"
>
关闭
</el-button>
<el-button
@
click=
"cancel"
>
关闭
</el-button>
</el-row>
</el-row>
</div>
</div>
...
@@ -14,7 +15,7 @@
...
@@ -14,7 +15,7 @@
<
script
>
<
script
>
import
{
approvalCreate
}
from
"
@/api/ecw/boxSea
"
;
import
{
approvalCreate
}
from
"
@/api/ecw/boxSea
"
;
import
{
serviceMsg
}
from
"
../utils
"
;
import
{
serviceMsg
,
toReviewDetail
}
from
"
../utils
"
;
/**
/**
* 反审
* 反审
...
@@ -26,9 +27,29 @@ export default {
...
@@ -26,9 +27,29 @@ export default {
return
{
return
{
// 反审对象
// 反审对象
reviewObj
:
{},
reviewObj
:
{},
isReview
:
false
,
bpmProcessId
:
""
,
};
};
},
},
created
()
{
const
{
currNode
,
shipmentObj
}
=
this
.
$attrs
;
if
(
currNode
.
type
===
"
preinstall
"
)
{
this
.
isReview
=
shipmentObj
[
"
preInstallBackInfo
"
]
?
true
:
false
;
this
.
bpmProcessId
=
shipmentObj
[
"
preInstallBackInfo
"
]?.
bpmProcessId
;
}
if
(
currNode
.
type
===
"
unloading
"
)
{
this
.
isReview
=
shipmentObj
[
"
cabinetUnloadBackApprovalInfo
"
]
?
true
:
false
;
this
.
bpmProcessId
=
shipmentObj
[
"
cabinetUnloadBackApprovalInfo
"
]?.
bpmProcessId
;
}
},
methods
:
{
methods
:
{
jumpReviewDetail
()
{
toReviewDetail
.
apply
(
this
,
[
this
.
bpmProcessId
]);
this
.
$emit
(
"
closeDialog
"
);
},
/** 提交 */
/** 提交 */
onSubmit
()
{
onSubmit
()
{
this
.
$refs
[
"
reviewForm
"
].
validate
((
valid
)
=>
{
this
.
$refs
[
"
reviewForm
"
].
validate
((
valid
)
=>
{
...
...
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