Skip to content

J
jiedao-app-operator-master
Commit a4958c79 authored by dcy's avatar dcy
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 9a3ff84a 6d69608b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 605 additions and 111 deletions
src/router/index.js
View file @ a4958c79
......@@ -362,6 +362,13 @@ export const constantRoutes = [
props: true,
name: 'shippingSea',
meta: {title: '海运出货操作', icon: '', activeMenu: '/shipment/boxSea'}
},
{
path: 'shippingSea/preinstall/:boxId(\\d+)',
component: (resolve) => import('@/views/ecw/box/shipping/preinstall'),
props: true,
name: 'preinstall',
meta: {title: '出货安排（预装）', icon: '', activeMenu: '/shipment/boxSea'}
}
]
},
......
src/views/ecw/box/shipping/agent.vue 0 → 100644
View file @ a4958c79
<template>
<div>
<el-form ref="agentForm" :rules="rules" :model="agent" label-width="120px">
<el-form-item label="代理商Agent">
<el-select v-model="agent.agent" placeholder="请选择代理商">
</el-select>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button @click="cancel">保存</el-button>
</el-row>
</div>
</template>
<script>
export default {
name: "agent",
data() {
return {
agent: {},
};
},
methods: {
onSubmit() {
this.$refs["agentForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shipping/booking.vue
View file @ a4958c79
<template>
<el-form ref="bookingForm" :rules="rules" :model="booking" label-width="120px" class="booking-form">
<div>
<el-form ref="bookingForm" :rules="rules" :model="booking" label-width="140px" class="booking-form">
<el-form-item label="SO NO">
<el-input v-model="booking.soNo"></el-input>
</el-form-item>
......@@ -31,14 +32,70 @@
<el-form-item label="预计驳船时间" prop="time">
<el-date-picker type="date" placeholder="请选择日期" v-model="booking.bargeTime"></el-date-picker>
</el-form-item>
<el-row>
<el-col span="12">
<el-form-item label="预计开船时间" prop="time">
<el-date-picker type="date" placeholder="请选择日期" v-model="booking.departureTime"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button @click="cancel">取消</el-button>
</el-col>
<el-col span="12">
<el-form-item label="通知人" label-width="80px">
<el-select v-model="booking.feedTimePerson" placeholder="请选择通知人">
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="12">
<el-form-item label="预计提单补料时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="booking.feedTime"></el-date-picker>
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="通知人" label-width="80px">
<el-select v-model="booking.feedTimePerson" placeholder="请选择通知人">
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="12">
<el-form-item label="预计报关时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="booking.declarationTime"></el-date-picker>
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="通知人" label-width="80px">
<el-select v-model="booking.feedTimePerson" placeholder="请选择通知人">
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="12">
<el-form-item label="预计截关时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="booking.cutOffTime"></el-date-picker>
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="通知人" label-width="80px">
<el-select v-model="booking.feedTimePerson" placeholder="请选择通知人">
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row class="operate-button">
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button @click="cancel">取消</el-button>
</el-row>
</div>
</template>
<script>
......@@ -67,13 +124,3 @@ export default {
},
};
</script>
<style lang="scss">
.booking-form {
.el-form-item__content {
> div {
width: 100%;
}
}
}
</style>
src/views/ecw/box/shipping/preinstall.vue 0 → 100644
View file @ a4958c79
This diff is collapsed.
src/views/ecw/box/shipping/flowChart.vue → src/views/ecw/box/shipping/shippingChart.vue
View file @ a4958c79
......@@ -9,7 +9,7 @@
<p>{{node.title}}</p>
</template>
<template v-else-if="node.unNode">
<el-button type="primary">AGENT</el-button>
<el-button type="primary" @click="nodeClick(node)">AGENT</el-button>
</template>
</div>
</div>
......@@ -18,9 +18,11 @@
</div>
</div>
</el-scrollbar>
<el-dialog :title="title" :visible.sync="dialogVisible" width="30%" destroy-on-close>
<booking @closeDialog="closeDialog" v-if="type === 'booking'" />
<trailer @closeDialog="closeDialog" v-if="type === 'trailer'" />
<el-dialog :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" :width="dialogConfig.width" destroy-on-close>
<booking @closeDialog="closeDialog" v-if="dialogConfig.type === 'booking'" />
<trailer @closeDialog="closeDialog" v-if="dialogConfig.type === 'trailer'" />
<preinstall v-if="dialogConfig.type === 'preinstall'" />
<agentWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'agent'" />
</el-dialog>
</div>
......@@ -29,18 +31,24 @@
<script>
import booking from "./booking";
import trailer from "./trailer";
import preinstall from "./preinstall";
import agentWidget from "./agent";
export default {
name: "flowChart",
components: { booking, trailer },
name: "shippingChart",
components: { booking, trailer, preinstall, agentWidget },
props: {
shippingType: String,
boxId: String,
},
data() {
return {
dialogConfig: {
dialogVisible: false,
title: "",
width: "30%",
type: "",
},
chartData: {
sea: [
[
......@@ -54,7 +62,7 @@ export default {
{
title: "预装",
imgSrc: require("@/assets/images/shipping/yz-start.png"),
type: "preinstalled",
type: "preinstall",
},
{
title: "拖车",
......@@ -63,7 +71,8 @@ export default {
},
{
unNode: true,
agent: true,
type: "agent",
title: "代理商设置",
},
],
[
......@@ -145,16 +154,27 @@ export default {
},
methods: {
closeDialog() {
this.dialogVisible = false;
this.$set(this.dialogConfig, "dialogVisible", false);
},
setCommonAttr(node) {
this.$set(this.dialogConfig, "dialogVisible", true);
this.$set(this.dialogConfig, "title", node.title);
this.$set(this.dialogConfig, "type", node.type);
},
nodeClick(node) {
console.log(node);
switch (node.type) {
case "booking":
this.$set(this.dialogConfig, "width", "40%");
this.setCommonAttr(node);
break;
case "trailer":
this.dialogVisible = true;
this.title = node.title;
this.type = node.type;
case "agent":
this.$set(this.dialogConfig, "width", "25%");
this.setCommonAttr(node);
break;
case "preinstall":
this.$router.push(`/boxSea/shippingSea/preinstall/${this.boxId}`);
break;
}
},
......@@ -167,7 +187,7 @@ export default {
width: max-content;
display: flex;
justify-content: center;
margin: 10px;
padding: 10px;
.chart-nodes {
display: flex;
align-items: center;
......@@ -183,7 +203,6 @@ export default {
}
}
.chart-arrow {
// margin: -15px 10px 0px 10px;
margin: 0 10px;
}
}
......
src/views/ecw/box/shipping/shippingSea.vue
View file @ a4958c79
......@@ -16,7 +16,7 @@
</el-card>
<div class="shipping-flow">
<flowChart />
<shippingChart :boxId="boxId" />
</div>
</el-col>
</el-row>
......@@ -24,12 +24,12 @@
</template>
<script>
import flowChart from "./flowChart";
import shippingChart from "./shippingChart";
export default {
name: "shippingSea",
components: {
flowChart,
shippingChart,
},
props: {
boxId: String,
......@@ -37,8 +37,17 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss">
.shipping-flow {
margin-top: 5px;
// 页面内元素弹框form控件宽度设置
.el-form-item__content {
> div {
width: 100%;
}
}
.operate-button {
text-align: center;
}
}
</style>
src/views/ecw/box/shipping/trailer.vue
View file @ a4958c79
<template>
<div>
<el-form ref="trailerForm" :rules="rules" :model="trailer" label-width="120px" class="trailer-form">
<el-form-item label="状态">
<el-select v-model="trailer.status" placeholder="请选择状态">
......@@ -28,11 +29,12 @@
<el-form-item label="封条">
<el-input v-model="trailer.seal"></el-input>
</el-form-item>
<el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button @click="cancel">取消</el-button>
</el-form-item>
</el-form>
</el-row>
</div>
</template>
<script>
......@@ -74,13 +76,3 @@ export default {
},
};
</script>
<style lang="scss">
.trailer-form {
.el-form-item__content {
> div {
width: 100%;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment