Skip to content

J
jiedao-app-operator-master
Commit 8b5d1375 authored by Marcus's avatar Marcus
Browse files
Options

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

parents 0246fe66 2270d256
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2029 additions and 384 deletions
src/api/ecw/customerContacts.js
View file @ 8b5d1375
...@@ -51,6 +51,14 @@ export function getCustomerContactsPage(query) { ...@@ -51,6 +51,14 @@ export function getCustomerContactsPage(query) {
}) })
} }
// 获得客户联系人下拉列表
export function getCustomerContactsSelect(query) {
return request({
url: '/ecw/customer-contacts/select',
method: 'get',
params: query
})
}
// 导出客户联系人 Excel // 导出客户联系人 Excel
export function exportCustomerContactsExcel(query) { export function exportCustomerContactsExcel(query) {
return request({ return request({
......
src/api/ecw/product.js
View file @ 8b5d1375
...@@ -69,3 +69,12 @@ export function batchUpdateProduct(data) { ...@@ -69,3 +69,12 @@ export function batchUpdateProduct(data) {
data: data data: data
}) })
} }
// 计算单种运输方式的商品费用(单个商品也做数组传参)
export function calculationPrice(data){
return request({
url: '/product/line/price/calculation',
method: 'post',
data: data
})
}
\ No newline at end of file
src/components/AreaSelector/index.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-select v-model="formData.country">
<el-option v-for="(item) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select>
<el-select v-model="formData.province">
<el-option v-for="(item) in provinceList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select>
<el-select v-model="formData.city">
<el-option v-for="(item) in cityList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select>
</div>
</template>
<script>
import { getListTree } from "@/api/ecw/region";
export default {
data(){
return {
formData:{
},
treeList: [],
provinceList: [],
cityList:[]
}
},
watch:{
'formData.city'(city){
this.$emit('cityChange', city)
},
'formData.country'(country){
this.$emit('countryChange', country)
this.treeList.forEach(item => {
if(item.id == country){
this.provinceList = item.children || []
}
})
},
'formData.province'(province){
this.$emit('provinceChange', province)
this.provinceList.forEach(item => {
if(item.id == province){
this.cityList = item.children || []
}
})
}
},
created(){
getListTree({treeType: 1}).then(response => {
this.treeList = response.data
})
}
}
</script>
\ No newline at end of file
src/components/CustomerContactSelector/index.vue 0 → 100644
View file @ 8b5d1375
<template>
<el-select
v-model="index"
filterable
clearable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="remoteMethod"
:loading="loading">
<el-option
v-for="(item, index) in list"
:key="item.id"
:label="`${item.contactsName}(${item.customerName})`"
:value="index">
</el-option>
</el-select>
</template>
<script>
import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts'
export default {
props:{
value: [String, Number]
},
data(){
return {
index: null,
list:[],
loading: false,
size: 20
}
},
watch:{
index(val){
this.$emit('input', val !== null ? this.list[val].customerContactsId: null)
this.$emit('change', val !== null ? this.list[val]: null)
},
value(val){
this.init()
}
},
created(){
this.init()
},
methods:{
init(){
if(!this.value) return
let index = this.list.findIndex(item => item.customerContactsId == this.value)
if(index < 0){
getCustomerContacts(this.value).then(res => {
this.list.unshift(res.data)
this.index = 0
})
}
},
remoteMethod(keyword){
let params = {
size: this.size
}
params.searchKey = keyword
this.loading = true
getCustomerContactsSelect(params)
.then(res => this.list = res.data)
.finally(() => this.loading = false)
}
}
}
</script>
\ No newline at end of file
src/components/ProductSelector/index.vue
View file @ 8b5d1375
...@@ -6,12 +6,14 @@ ...@@ -6,12 +6,14 @@
remote remote
reserve-keyword reserve-keyword
placeholder="请输入商品关键词" placeholder="请输入商品关键词"
:disabled="disabled"
:remote-method="remoteMethod" :remote-method="remoteMethod"
:loading="loading"> :loading="loading">
<el-option <el-option
v-for="(item, index) in list" v-for="(item, index) in list"
:key="item.id" :key="item.id"
:label="item.titleZh" :label="item.titleZh"
:value="index"> :value="index">
</el-option> </el-option>
</el-select> </el-select>
...@@ -22,19 +24,23 @@ import {getProduct, getProductPage} from '@/api/ecw/product' ...@@ -22,19 +24,23 @@ import {getProduct, getProductPage} from '@/api/ecw/product'
export default { export default {
props:{ props:{
productType: [String, Number], productType: [String, Number],
value: [String, Number] value: [String, Number],
disabled: Boolean
}, },
data(){ data(){
return { return {
index: {}, index: null,
list:[], list:[],
loading: false loading: false
} }
}, },
watch:{ watch:{
index(val){ index(val){
this.$emit('input', val !== null ? this.list[val].id : null)
this.$emit('change', val !== null ? this.list[val] : null) let productId = val !== '' && val !== null ? this.list[val].id : null
console.log('index val', val, productId)
this.$emit('input', productId)
this.$emit('change', val != '' && val !== null ? this.list[val] : null)
}, },
value(val){ value(val){
console.log('初始化内容', val) console.log('初始化内容', val)
......
src/router/index.js
View file @ 8b5d1375
...@@ -298,7 +298,7 @@ export const constantRoutes = [ ...@@ -298,7 +298,7 @@ export const constantRoutes = [
}, */ }, */
{ {
path: 'shippingSea/:boxId(\\d+)', path: 'shippingSea/:boxId(\\d+)',
component: (resolve) => import('@/views/ecw/box/shipping/shippingSea'), component: (resolve) => import('@/views/ecw/box/shippingSea/shippingSea'),
props: true, props: true,
name: 'shippingSea', name: 'shippingSea',
meta: {title: '海运出货操作', icon: '', activeMenu: '/shipment/boxSea'} meta: {title: '海运出货操作', icon: '', activeMenu: '/shipment/boxSea'}
......
src/utils/dict.js
View file @ 8b5d1375
...@@ -97,6 +97,8 @@ export const DICT_TYPE = { ...@@ -97,6 +97,8 @@ export const DICT_TYPE = {
ECW_OFFER_TYPE: 'offer_type', // 跟进类型 ECW_OFFER_TYPE: 'offer_type', // 跟进类型
ECW_OFFER_METHOD: 'offer_method', // 跟进方式 ECW_OFFER_METHOD: 'offer_method', // 跟进方式
ECW_RECEIPT_STATE: 'receipt_state',//收款单状态 ECW_RECEIPT_STATE: 'receipt_state',//收款单状态
ECW_SUING_METHOD: 'suing_method', // 出单方式
ECW_HARVEST_METHOD: 'harvest_method', // 收货方式
//--------ecw--------- //--------ecw---------
CUSTOMER_STATUS: 'customer_status', CUSTOMER_STATUS: 'customer_status',
CUSTOMER_SOURCE: 'customer_source', CUSTOMER_SOURCE: 'customer_source',
...@@ -140,7 +142,7 @@ export const DICT_TYPE = { ...@@ -140,7 +142,7 @@ export const DICT_TYPE = {
BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别 BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别
ORDER_ERROR_TYPE:'order_error_type',//订单异常类型 ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态 ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
ECASH_INIT:'ecash_init',//e-cash
} }
/** /**
......
src/views/ecw/box/shipping/agent.vue → src/views/ecw/box/shippingSea/nodePage/agent.vue
View file @ 8b5d1375
<template> <template>
<div> <div>
<el-form ref="agentForm" :rules="rules" :model="agent" label-width="120px"> <el-form ref="agentForm" :model="agentObj" label-width="120px">
<el-form-item label="代理商Agent"> <el-form-item label="代理商Agent">
<el-select v-model="agent.agent" placeholder="请选择代理商"> <el-select v-model="agentObj.agent" placeholder="请选择代理商">
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit">提交</el-button> <el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="cancel">保存</el-button> <el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
...@@ -22,7 +23,7 @@ export default { ...@@ -22,7 +23,7 @@ export default {
data() { data() {
return { return {
// agent对象 // agent对象
agent: {}, agentObj: {},
}; };
}, },
methods: { methods: {
......
src/views/ecw/box/shippingSea/nodePage/arrival.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="arrivalForm" :rules="rules" :model="arrivalObj" label-width="120px">
<el-form-item label="预计到港时间">{{arrivalObj.expectedTime}}</el-form-item>
<el-form-item label="实际到港时间">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="arrivalObj.actualTime"></el-date-picker>
</el-form-item>
<el-form-item label="确认到港" prop="confirmTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="arrivalObj.confirmTime">
</el-date-picker>
<p class="message-area" v-show="showMsg">请确认是否有异常，如有异常请进行异常登记</p>
</el-form-item>
<el-form-item label="卸港时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="arrivalObj.dischargeTime"></el-date-picker>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button>
</el-row>
<!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<regError @closeDialog="dialogVisible = false" />
</el-dialog>
</div>
</template>
<script>
import regError from "./regError";
import dayjs from "dayjs";
/**
* 到港
*/
export default {
name: "arrival",
components: {
regError,
},
data() {
return {
// 到港对象
arrivalObj: {
expectedTime: "2022-07-18",
},
// 校验
rules: {
actualTime: [{ required: true, message: "必填", trigger: "change" }],
},
// 弹窗配置
dialogVisible: false,
// 提示消息
showMsg: false,
};
},
watch: {
// 预计到港时间
"arrivalObj.expectedTime"(val) {
this.compareDate(val, this.arrivalObj.confirmTime);
},
// 确认到港时间
"arrivalObj.confirmTime"(val) {
this.compareDate(this.arrivalObj.expectedTime, val);
},
},
methods: {
// 时间比较
compareDate(expectedTime, confirmTime) {
this.showMsg = false;
let date1 = null,
date2 = null;
if (expectedTime) date1 = dayjs(expectedTime);
if (confirmTime) date2 = dayjs(confirmTime);
if (date1 && date2) {
const days = date2.date() - date1.date();
if (days > 5) {
this.showMsg = true;
}
}
},
// 异常登记
exceptionReg() {
this.dialogVisible = true;
},
/** 提交 */
onSubmit() {
this.$refs["arrivalForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
.message-area {
margin: 0;
color: red;
}
</style>
src/views/ecw/box/shippingSea/nodePage/barge.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="bargeForm" :model="bargeObj" label-width="80px">
<el-form-item label="驳船">
<el-radio-group v-model="bargeObj.status">
<el-radio v-for="item in bargeStatus" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<div v-show="bargeObj.status === '2'">
<el-row>
<el-col :span="12">
<el-form-item label="驳船预计开船时间" label-width="130px">
<el-date-picker type="date" placeholder="请选择日期" v-model="bargeObj.expectedTime"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通知人" label-width="80px">
<el-select v-model="bargeObj.feedTimePerson" placeholder="请选择通知人">
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="驳船实际开船时间" label-width="130px">
<el-date-picker type="date" placeholder="请选择日期" v-model="bargeObj.actualTime"></el-date-picker>
</el-form-item>
</div>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 驳船
*/
export default {
name: "barge",
data() {
return {
// 驳船对象
bargeObj: {},
// 驳船
bargeStatus: [
{
value: "1",
label: "无驳船",
},
{
value: "2",
label: "有驳船",
},
],
};
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["bargeForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shippingSea/nodePage/blCopy.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="blCopyForm" :model="blCopyObj" label-width="120px">
<el-form-item label="提单Copy">
<el-upload action="" :file-list="blCopyObj.fileList">
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 提单copy
*/
export default {
name: "blCopy",
data() {
return {
// 提单copy对象
blCopyObj: {
fileList: [],
},
};
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["blCopyForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shipping/booking.vue → src/views/ecw/box/shippingSea/nodePage/booking.vue
View file @ 8b5d1375
<template> <template>
<div> <div>
<el-form ref="bookingForm" :rules="rules" :model="booking" label-width="140px" class="booking-form"> <el-form ref="bookingForm" :rules="rules" :model="booking" label-width="140px">
<el-form-item label="SO NO"> <el-form-item label="SO NO">
<el-input v-model="booking.soNo"></el-input> <el-input v-model="booking.soNo" placeholder="请输入SO NO"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="船公司类型"> <el-form-item label="船公司类型">
<el-select v-model="booking.type" placeholder="请选择船公司类型"> <el-select v-model="booking.type" placeholder="请选择船公司类型">
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</el-form> </el-form>
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit">提交</el-button> <el-button type="primary" @click="onSubmit">提交</el-button>
<el-button @click="cancel">取消</el-button> <el-button @click="cancel">关闭</el-button>
</el-row> </el-row>
</div> </div>
......
src/views/ecw/box/shipping/cabinet/index.vue → src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue
View file @ 8b5d1375
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<el-date-picker type="date" placeholder="请选择日期" v-model="cabinet.outTime"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="cabinet.outTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="装柜图片"> <el-form-item label="装柜图片">
<el-upload class="upload-demo" action="" :limit="1" :file-list="cabinet.fileList"> <el-upload action="" :limit="1" :file-list="cabinet.fileList">
<el-button size="small" type="primary">点击上传</el-button> <el-button size="small" type="primary">选择文件</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary" @click="onSubmit">保存</el-button> <el-button type="primary" @click="onSubmit">保存</el-button>
<el-button type="success">封柜</el-button> <el-button type="success">封柜</el-button>
<el-button @click="cancel">取消</el-button> <el-button @click="cancel">关闭</el-button>
<el-button type="danger" @click="startCabinet">开始装柜</el-button> <el-button type="danger" @click="startCabinet">开始装柜</el-button>
</el-row> </el-row>
</div> </div>
......
src/views/ecw/box/shippingSea/nodePage/clrDocument.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="cDocForm" :model="cDocObj" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="出单方式">
<el-select v-model="cDocObj.method" placeholder="请选择出单方式">
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电放时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.dischargeTime"></el-date-picker>
</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="cDocObj.deliveryTime"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="快递单号">
<el-input v-model="cDocObj.courierNumber" placeholder="请输入快递单号"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="电放凭证附件">
<el-upload action="" :file-list="cDocObj.fileList">
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="agent list">
<el-radio-group v-model="cDocObj.agent">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.agenTime"></el-date-picker>
</el-form-item>
<el-form-item>
<el-upload action="" :file-list="cDocObj.agentFileList">
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="soncap">
<el-radio-group v-model="cDocObj.soncap">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-date-picker type="date" placeholder="请选择日期" v-model="cDocObj.soncapTime"></el-date-picker>
</el-form-item>
<el-form-item>
<el-upload action="" :file-list="cDocObj.soncapFileList">
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 清关文件
*/
export default {
name: "clrDocument",
data() {
return {
// 清关文件对象
cDocObj: {
fileList: [],
},
// 出单方式
method: [
{
value: "1",
label: "正本",
},
{
value: "2",
label: "电放",
},
],
// 选项
status: [
{
value: "1",
label: "无需",
},
{
value: "2",
label: "已做",
},
],
};
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["cDocForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shippingSea/nodePage/cusClearance.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="cusClearanceForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
<el-form-item label="清关代理">{{cusClearanceObj.agent}}</el-form-item>
<el-form-item label="预计清关时间" prop="expectedTime">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusClearanceObj.expectedTime"></el-date-picker>
</el-form-item>
<el-form-item label="清关时间" prop="confirmTime">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="cusClearanceObj.confirmTime"></el-date-picker>
<p class="message-area" v-show="showMsg">清关时间与预计时间不符，如有异常请登记</p>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button>
</el-row>
<!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<regError @closeDialog="dialogVisible = false" />
</el-dialog>
</div>
</template>
<script>
import regError from "./regError";
import dayjs from "dayjs";
/**
* 清关
*/
export default {
name: "cusClearance",
components: {
regError,
},
data() {
return {
// 清关对象
cusClearanceObj: {
agent: "test111",
},
// 校验
rules: {
expectedTime: [{ required: true, message: "必填", trigger: "change" }],
confirmTime: [{ required: true, message: "必填", trigger: "change" }],
},
// 弹窗配置
dialogVisible: false,
// 提示消息
showMsg: false,
};
},
watch: {
// 预计清关时间
"cusClearanceObj.expectedTime"(val) {
this.compareDate(val, this.cusClearanceObj.confirmTime);
},
// 清关时间
"cusClearanceObj.confirmTime"(val) {
this.compareDate(this.cusClearanceObj.expectedTime, val);
},
},
methods: {
// 时间比较
compareDate(expectedTime, confirmTime) {
this.showMsg = false;
let date1 = null,
date2 = null;
if (expectedTime) date1 = dayjs(expectedTime);
if (confirmTime) date2 = dayjs(confirmTime);
if (date1 && date2 && date2 !== date1) {
this.showMsg = true;
}
},
// 异常登记
exceptionReg() {
this.dialogVisible = true;
},
/** 提交 */
onSubmit() {
this.$refs["cusClearanceForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
.message-area {
margin: 0;
color: red;
}
</style>
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="cusDeclarationForm" :rules="rules" :model="cusDeclaration" label-width="120px">
<el-form-item label="单证要求">我司全代 <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">VGM声明</el-button>
</el-form-item>
<el-form-item label="柜重" prop="cabinetWeight">
<el-input v-model="cusDeclaration.cabinetWeight" placeholder="请输入柜重" clearable />
</el-form-item>
<el-form-item label="货重" prop="cargoWeight">
<el-input v-model="cusDeclaration.cargoWeight" placeholder="请输入货重" clearable />
</el-form-item>
<el-form-item label="VGM重量（柜重+货重）">
<el-input v-model="cusDeclaration.vgmWeight" placeholder="请输入VGM重量" clearable />
</el-form-item>
<el-form-item label="报关方式" prop="method">
<el-select v-model="cusDeclaration.method" placeholder="请选择报关方式">
<el-option v-for="item in methods" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="正常报关订单">
</el-form-item>
<el-form-item label="报关公司名称">
<el-select v-model="cusDeclaration.companyName" placeholder="请选择报关公司名称">
</el-select>
</el-form-item>
<el-form-item label="截关时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclaration.cutTime"></el-date-picker>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="cusDeclaration.status">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<!-- 查验 -->
<div v-show="cusDeclaration.status === '3'">
<el-form-item label="查验">
<el-radio-group v-model="cusDeclaration.check">
<el-radio v-for="item in checkItems" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
</div>
<!-- 退场 -->
<div v-show="cusDeclaration.check === '1' || cusDeclaration.check === '2'">
<el-form-item label="查验时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclaration.checkTime"></el-date-picker>
</el-form-item>
<el-form-item label="查验前图片">
<el-upload action="" :limit="1" :file-list="cusDeclaration.checkFile">
<el-button size="small" type="primary">选择文件</el-button>
</el-upload>
</el-form-item>
<el-form-item label="新封条">
<el-input v-model="cusDeclaration.newSeal" placeholder="请输入新封条" clearable />
</el-form-item>
</div>
<!-- 放行 -->
<el-form-item label="放行时间" v-show="cusDeclaration.status === '2' || cusDeclaration.check === '2'">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclaration.releaseTime"></el-date-picker>
</el-form-item>
<el-form-item label="装箱单">
<el-button type="primary">下载装箱单</el-button>
</el-form-item>
<el-form-item label="报关单">
<el-button type="primary">下载所有报关单</el-button>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
<el-button type="primary" @click="extraCost">额外费用</el-button>
</el-row>
<!-- 对话框 -->
<el-dialog custom-class="shipping-dialog customsClearance" :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<el-row>
<el-row>
<el-form label-width="100px">
<el-form-item label="订单号" class="two-element">
<el-input v-model="orderNo" placeholder="请输入订单号" clearable />
<el-button type="primary" icon="el-icon-search"></el-button>
</el-form-item>
</el-form>
</el-row>
<el-row>
<el-table :data="[{}]">
<el-table-column label="订单号" align="center" prop="selfNo" />
<el-table-column label="报关费用" align="center" prop="orderFees">
<template slot-scope="scope">
<el-input v-model="scope.row.orderFees" placeholder="请输入内容" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="primary" size="small">确定</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row class="cost-title">
<div>额外费用订单</div>
<div>
<el-button size="small">重置</el-button>
</div>
</el-row>
<el-row>
<el-table :data="[{}]">
<el-table-column type="selection" width="55" />
<el-table-column label="订单号" align="center" prop="selfNo" />
<el-table-column label="报关费用" align="center" prop="customsFees">
<template slot-scope="scope">
<el-input v-model="scope.row.customsFees" placeholder="请输入内容" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="primary" size="small">修改</el-button>
<el-button size="small">重置</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
</el-row>
</el-dialog>
</div>
</template>
<script>
/**
* 报关
*/
export default {
name: "cusDeclaration",
data() {
return {
// 报关方式
methods: [
{
value: "1",
label: "整柜买单报关",
},
{
value: "2",
label: "整柜正常报关",
},
{
value: "3",
label: "买单报关+正常报关",
},
],
// 状态
status: [
{
value: "1",
label: "报关中",
},
{
value: "2",
label: "放行",
},
{
value: "3",
label: "查验",
},
],
// check
checkItems: [
{
value: "1",
label: "退场",
},
{
value: "2",
label: "部分退场",
},
{
value: "3",
label: "查验后放行",
},
],
// 报关对象
cusDeclaration: {},
// 校验
rules: {
cabinetWeight: [{ required: true, message: "必填", trigger: "change" }],
cargoWeight: [{ required: true, message: "必填", trigger: "change" }],
method: [{ required: true, message: "必填", trigger: "change" }],
},
// 弹窗配置
dialogConfig: {
title: "",
dialogVisible: false,
},
// 订单号
orderNo: "",
};
},
watch: {
"cusDeclaration.status"(val) {
if (val !== "3") {
this.$set(this.cusDeclaration, "check", "");
}
},
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["cusDeclarationForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
// 下载VGM
downloadVGM() {
window.open(
"http://pdatest.groupage.cn//apivue/boxTrack/vgmExport?token=930b11a41d9ca06f306d157f336a5dcb&id=1752"
);
},
// 额外费用
extraCost() {
this.$set(this.dialogConfig, "title", "自编号");
this.$set(this.dialogConfig, "dialogVisible", true);
},
},
};
</script>
<style lang="scss">
.customsClearance {
.cost-title {
display: flex;
align-items: center;
margin: 20px 0;
border-left: 5px solid gray;
> div:first-child {
margin-left: 10px;
}
> div:last-child {
flex: 1;
text-align: right;
}
}
}
</style>
src/views/ecw/box/shippingSea/nodePage/departure.vue 0 → 100644
View file @ 8b5d1375
<template>
<div class="app-departure">
<el-form ref="departureForm" :rules="rules" :model="departureObj" label-width="120px">
<el-form-item label="预计开船时间">
</el-form-item>
<el-form-item label="实际开船时间">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="departureObj.actualTime"></el-date-picker>
<p class="message-area">订单状态与短信通知，将到指定时间更新与发送</p>
<p class="message-area" v-show="showMsg">实际开船实际与预计时间不符</p>
</el-form-item>
<el-form-item label="预期到港时间" prop="arrivalTime">
<el-date-picker type="date" placeholder="请选择日期" v-model="departureObj.arrivalTime">
</el-date-picker>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button>
</el-row>
<!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<regError @closeDialog="dialogVisible = false" />
</el-dialog>
</div>
</template>
<script>
import regError from "./regError";
/**
* 起运
*/
export default {
name: "departure",
components: { regError },
data() {
return {
// 起运对象
departureObj: {},
// 校验
rules: {
arrivalTime: [{ required: true, message: "必填", trigger: "change" }],
},
// 弹窗配置
dialogVisible: false,
// 提示消息
showMsg: false,
};
},
watch: {
// 实际开船时间
"departureObj.actualTime"(val) {
this.compareDate(val, this.departureObj.arrivalTime);
},
// 预计到港时间
"departureObj.arrivalTime"(val) {
this.compareDate(this.departureObj.actualTime, val);
},
},
methods: {
// 时间比较
compareDate(actualTime, arrivalTime) {
this.showMsg = false;
let date1 = null,
date2 = null;
if (actualTime) date1 = new Date(actualTime);
if (arrivalTime) date2 = new Date(arrivalTime);
if (date1 && date2 && date1 > date2) {
this.showMsg = true;
}
},
// 异常登记
exceptionReg() {
this.dialogVisible = true;
},
/** 提交 */
onSubmit() {
this.$refs["departureForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
.app-departure {
.message-area {
margin: 0;
color: red;
}
}
</style>
src/views/ecw/box/shippingSea/nodePage/regError.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="errorForm" :model="errorObj" label-width="140px">
<el-form-item label="操作步骤">
<el-select v-model="errorObj.step" placeholder="请选择操作步骤">
</el-select>
</el-form-item>
<el-form-item label="票异常">
<el-select v-model="errorObj.ticketError" placeholder="请选择票异常">
</el-select>
</el-form-item>
<el-form-item label="异常情况">
<el-input v-model="errorObj.description" type="textarea" rows="2" placeholder="请输入异常情况"></el-input>
</el-form-item>
<el-form-item label="异常时间" prop="arrivalTime" class="two-element">
<el-date-picker type="date" placeholder="请选择日期" v-model="errorObj.errorStart"></el-date-picker>
<el-date-picker type="date" placeholder="请选择日期" v-model="errorObj.errorend"></el-date-picker>
</el-form-item>
<el-form-item label="是否更新订单状态">
<el-radio-group v-model="errorObj.updateOrder">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="中文内容">
<el-input v-model="errorObj.chContent" type="textarea" rows="2" placeholder="请输入中文内容"></el-input>
</el-form-item>
<el-form-item label="英文内容">
<el-input v-model="errorObj.enContent" type="textarea" rows="2" placeholder="请输入英文内容"></el-input>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="$emit('closeDialog')">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 异常登记
*/
export default {
name: "regError",
data() {
return {
// 异常对象
errorObj: {},
// 是否更新订单动态
status: [
{
value: "1",
label: "是",
},
{
value: "2",
label: "否",
},
],
};
},
watch: {},
methods: {
/** 提交 */
onSubmit() {
this.$refs["errorForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shippingSea/nodePage/ship.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="shipForm" :model="shipObj" label-width="80px">
<el-form-item label="状态">
<el-radio-group v-model="shipObj.status">
<el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="配船时间" v-show="shipObj.status === '2'">
<el-date-picker type="date" placeholder="请选择日期" v-model="shipObj.shipTime"></el-date-picker>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 配船
*/
export default {
name: "ship",
data() {
return {
// 配船对象
shipObj: {},
// 状态
status: [
{
value: "1",
label: "免配",
},
{
value: "2",
label: "已配",
},
],
};
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["shipForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shippingSea/nodePage/subMaterial.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="subMaterialForm" :model="subMaterialObj" label-width="140px">
<el-form-item label="代理商AGENT">
<el-select v-model="subMaterialObj.agent" placeholder="请选择供应商">
</el-select>
</el-form-item>
<el-form-item label="提单号M/BL NO." class="two-element">
<el-input v-model="subMaterialObj.billNo" placeholder="请输入提单号"></el-input>
<el-button type="primary">提单确认邮件</el-button>
</el-form-item>
<el-form-item label="SO NO.">
<el-input v-model="subMaterialObj.soNo" placeholder="请输入SO NO"></el-input>
</el-form-item>
<el-form-item label="装货港">
<el-select v-model="subMaterialObj.loadingPort" placeholder="请选择装货港">
</el-select>
</el-form-item>
<el-form-item label="目的港">
<el-select v-model="subMaterialObj.destination" placeholder="请选择目的港">
</el-select>
</el-form-item>
<el-form-item label="船公司">
<el-select v-model="subMaterialObj.shippingCompany" placeholder="请选择船公司">
</el-select>
</el-form-item>
<el-form-item label="托运人">
<el-select v-model="subMaterialObj.shipper" placeholder="请选择托运人">
</el-select>
</el-form-item>
<el-form-item label="收货人">
<el-select v-model="subMaterialObj.consignee" placeholder="请选择收货人">
</el-select>
</el-form-item>
<el-form-item label="通知方">
<el-select v-model="subMaterialObj.notifyParty" placeholder="请选择通知方">
</el-select>
</el-form-item>
<el-form-item label="Mark & No.">
<el-input v-model="subMaterialObj.markNo"></el-input>
</el-form-item>
<el-form-item label="包装数量与单位" class="two-element">
<el-input v-model="subMaterialObj.quantity" placeholder="请输入包装数量"></el-input>
<el-select v-model="subMaterialObj.unit" placeholder="请选择单位">
</el-select>
</el-form-item>
<el-form-item label="毛重(KGS)">
<el-input v-model="subMaterialObj.grossWeight" placeholder="请输入毛重(KGS)"></el-input>
</el-form-item>
<el-form-item label="立方数(CBM)">
<el-input v-model="subMaterialObj.mesaurement" placeholder="请输入立方数(CBM)"></el-input>
</el-form-item>
<el-form-item label="货物描述">
<el-input v-model="subMaterialObj.description" placeholder="请输入货物描述"></el-input>
</el-form-item>
<el-form-item label="柜号/封条">
<el-input v-model="subMaterialObj.container" placeholder="请输入柜号/封条"></el-input>
</el-form-item>
<el-form-item label="柜型">
111
</el-form-item>
<el-form-item label="出单方式">
<el-radio-group v-model="subMaterialObj.billingMethod">
<el-radio v-for="item in method" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="subMaterialObj.remark" type="textarea" rows="2" placeholder="请输入备注"></el-input>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 提单补料
*/
export default {
name: "subMaterial",
data() {
return {
// 提单补料对象
subMaterialObj: {
markNo: "N/M",
},
// 出单方式
method: [
{
value: "1",
label: "正本",
},
{
value: "2",
label: "电放",
},
],
};
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["subMaterialForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
},
};
</script>
<style lang="scss">
</style>
src/views/ecw/box/shipping/trailer.vue → src/views/ecw/box/shippingSea/nodePage/trailer.vue
View file @ 8b5d1375
...@@ -15,24 +15,25 @@ ...@@ -15,24 +15,25 @@
<el-date-picker type="date" placeholder="请选择日期" v-model="trailer.trailerTime"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="trailer.trailerTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="车牌"> <el-form-item label="车牌">
<el-input v-model="trailer.licensePlate"></el-input> <el-input v-model="trailer.licensePlate" placeholder="请输入车牌"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="司机"> <el-form-item label="司机">
<el-input v-model="trailer.driver"></el-input> <el-input v-model="trailer.driver" placeholder="请输入司机"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="司机联系方式"> <el-form-item label="司机联系方式">
<el-input v-model="trailer.telephone"></el-input> <el-input v-model="trailer.telephone" placeholder="请输入司机联系方式"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="货柜号"> <el-form-item label="货柜号">
<el-input v-model="trailer.containerNumber"></el-input> <el-input v-model="trailer.containerNumber" placeholder="请输入货柜号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="封条"> <el-form-item label="封条">
<el-input v-model="trailer.seal"></el-input> <el-input v-model="trailer.seal" placeholder="请输入封条"></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="primary" @click="onSubmit">提交</el-button> <el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="cancel">取消</el-button> <el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
</el-row> </el-row>
</div> </div>
</template> </template>
......
src/views/ecw/box/shippingSea/nodePage/unloading/index.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="unloadingForm" :model="unloadingObj" label-width="100px">
<el-form-item label="网点">
<el-select v-model="unloadingObj.outlets" placeholder="请选择网点">
</el-select>
</el-form-item>
<el-form-item label="到仓时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="unloadingObj.warehouseTime"></el-date-picker>
</el-form-item>
<el-form-item label="卸柜时间">
<el-date-picker type="datetime" placeholder="请选择日期" v-model="unloadingObj.unloadingTime"></el-date-picker>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button>
<el-button type="danger" @click="startUnloading">开始卸柜</el-button>
</el-row>
<!-- 开始卸柜 -->
<el-dialog title="开始卸柜" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body destroy-on-close>
<startUnloading />
</el-dialog>
</div>
</template>
<script>
import startUnloading from "./startUnloading.vue";
/**
* 卸柜
*/
export default {
name: "unloading",
components: { startUnloading },
data() {
return {
// 清关对象
unloadingObj: {
agent: "test111",
},
// 弹窗状态
dialogVisible: false,
};
},
watch: {},
methods: {
/** 提交 */
onSubmit() {
this.$refs["unloadingForm"].validate((valid) => {
if (valid) {
// TODO 判断是否已经卸柜
this.$message.warning("请先通过卸柜审批");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
// 开始卸柜
startUnloading() {
this.dialogVisible = true;
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue 0 → 100644
View file @ 8b5d1375
<template>
<div class="app-startUnloading">
<!-- 自编号 -->
<el-row class="number-area">
<p class="label-font">自编号：</p>
<p class="label-font">CNG2510</p>
<el-input v-model="labelNo" placeholder="请输入标签号"></el-input>
<div>
<el-button>批量输入</el-button>
<el-button>一键卸柜</el-button>
</div>
</el-row>
<!-- 当前部分 -->
<el-row class="number-area">
<p class="label-font">当前部分：</p>
<el-select v-model="currPart" placeholder="请选择当前部分">
</el-select>
<p>
<span>13箱</span>
<span>10.83m3</span>
<span>210kg</span>
</p>
</el-row>
<!-- 表格 -->
<el-row>
<el-table v-loading="loading" :data="list">
<el-table-column label="序号" type="index" width="50" />
<!-- <el-table-column label="订单号" align="center" prop="selfNo">
<template slot-scope="scope">
<a href="javascript:void(0);" class="order-href" @click="orderClick(scope.row)">{{ scope.row.selfNo }}</a>
</template>
</el-table-column> -->
<el-table-column label="订单号" align="center" prop="cubNo" />
<el-table-column label="商品信息" align="center" prop="cubNo" />
<el-table-column label="实装箱数" align="center" prop="cabinetId" />
<el-table-column label="卸柜箱数" align="center" prop="transportType" />
<el-table-column label="清关状态" align="center" prop="squareNumber" />
<el-table-column label="体积" align="center" prop="weight" />
<el-table-column label="重量" align="center" prop="weight" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="openError">异常</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<!-- 总计 -->
<el-row>
<div>
<p>
<span>总计：</span>
<span>33箱子</span>
<span>10.83m3</span>
<span>210kg</span>
</p>
</div>
<div>
<p>
<span>已卸：</span>
<span>16</span>
</p>
</div>
</el-row>
<el-row>
<el-button type="success">卸柜完成</el-button>
</el-row>
<!-- 对话框 -->
<el-dialog custom-class="shipping-dialog" title="异常" :visible.sync="dialogVisible" width="500px" :modal-append-to-body=false append-to-body destroy-on-close>
<unloadingError @closeDialog="dialogVisible = false" />
</el-dialog>
</div>
</template>
<script>
import unloadingError from "./unloadingError.vue";
/**
* 开始卸柜
*/
export default {
name: "startUnloading",
components: { unloadingError },
data() {
return {
// 标签号
labelNo: "",
// 当前部分
currPart: "",
// loading
loading: false,
// 表格数据
list: [{}],
// 弹窗配置
dialogVisible: false,
};
},
watch: {},
methods: {
/** 提交 */
onSubmit() {
this.$refs["unloadingForm"].validate((valid) => {
if (valid) {
// TODO 判断是否已经卸柜
this.$message.warning("请先通过卸柜审批");
}
});
},
/** 取消 */
cancel() {
this.$emit("closeDialog");
},
// 打开异常
openError() {
this.dialogVisible = true;
},
},
};
</script>
<style lang="scss" scoped>
.app-startUnloading {
p {
margin: 0;
> span {
margin-right: 5px;
}
}
.el-row {
margin-bottom: 15px;
}
.label-font {
font-size: 16px;
font-weight: bolder;
}
.number-area {
display: flex;
align-items: center;
> * {
margin-right: 10px;
}
> .el-input {
width: 200px;
}
}
}
</style>
src/views/ecw/box/shippingSea/nodePage/unloading/unloadingError.vue 0 → 100644
View file @ 8b5d1375
<template>
<div>
<el-form ref="errorForm" :model="errorObj" label-width="100px">
<el-form-item label="异常">
<el-radio-group v-model="errorObj.errorStatus">
</el-radio-group>
</el-form-item>
<el-form-item label="品名">
<el-select v-model="errorObj.goodName" placeholder="请选择品名">
</el-select>
</el-form-item>
<el-form-item label="件数">
<el-input-number v-model="errorObj.pieces" controls-position="right" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="异常详情">
<el-input v-model="errorObj.details" type="textarea" rows="2" placeholder="请输入异常详情"></el-input>
</el-form-item>
</el-form>
<el-row class="operate-button">
<el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="$emit('closeDialog')">关闭</el-button>
</el-row>
</div>
</template>
<script>
/**
* 卸柜异常
*/
export default {
name: "unloadingError",
data() {
return {
// 异常对象
errorObj: {},
};
},
methods: {
/** 提交 */
onSubmit() {
this.$refs["errorForm"].validate((valid) => {
if (valid) {
alert("submit!");
}
});
},
},
};
</script>
<style lang="scss" scoped>
</style>
src/views/ecw/box/shipping/shippingChart.vue → src/views/ecw/box/shippingSea/seaProcess.vue
View file @ 8b5d1375
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
<!-- 海运流程图 --> <!-- 海运流程图 -->
<el-scrollbar :vertical="true" style="width: 100%;" viewClass="shipping-chart"> <el-scrollbar :vertical="true" style="width: 100%;" viewClass="shipping-chart">
<div v-for="(nodes,index) in chartData['sea']" :key="index" class="chart-nodes"> <div v-for="(nodes,index) in chartData['sea']" :key="index" class="chart-nodes">
<div> <div class="node-area">
<div v-for="node in nodes" :key="node.title" @click="nodeClick(node)" class="node-div"> <div v-for="node in nodes" :key="node.title" @click="nodeClick(node)" class="node-div">
<template v-if="!node.unNode"> <template v-if="!node.unNode">
<img :src="node.imgSrc" alt=""> <img :src="node.imgSrc" alt="">
<p>{{node.title}}</p> <p>{{node.title}}</p>
</template> </template>
<template v-else-if="node.unNode"> <template v-else-if="node.unNode">
<el-button type="primary" @click="nodeClick(node)">AGENT</el-button> <el-button type="primary" @click="nodeClick(node)" style="width:100px;">{{node.title}}</el-button>
</template> </template>
</div> </div>
</div> </div>
<div class="chart-arrow" v-if="index !== (chartData['sea'].length-1)"> <div class="arrow-area" v-if="index !== (chartData['sea'].length-1)">
<img src="@/assets/images/shipping/jt-start.png" alt=""> <img src="@/assets/images/shipping/jt-start.png" alt="">
</div> </div>
</div> </div>
...@@ -22,27 +22,27 @@ ...@@ -22,27 +22,27 @@
<!-- 弹窗 --> <!-- 弹窗 -->
<el-dialog custom-class="shipping-dialog" :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" :width="dialogConfig.width" :fullscreen="dialogConfig.fullscreen" :close-on-click-modal=false :modal-append-to-body=false append-to-body destroy-on-close> <el-dialog custom-class="shipping-dialog" :title="dialogConfig.title" :visible.sync="dialogConfig.dialogVisible" :width="dialogConfig.width" :fullscreen="dialogConfig.fullscreen" :close-on-click-modal=false :modal-append-to-body=false append-to-body destroy-on-close>
<!-- 订舱 --> <component v-bind:is="currentComponent" @closeDialog="closeDialog"></component>
<bookingWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'booking'" />
<!-- 拖车 -->
<trailerWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'trailer'" />
<!-- 预装 -->
<preinstallWidget v-if="dialogConfig.type === 'preinstall'" />
<!-- agent -->
<agentWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'agent'" />
<!-- 装柜 -->
<cabinetWidget :boxId="boxId" @closeDialog="closeDialog" v-if="dialogConfig.type === 'cabinet'" />
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import bookingWidget from "./booking"; import bookingWidget from "./nodePage/booking.vue";
import trailerWidget from "./trailer"; import trailerWidget from "./nodePage/trailer.vue";
import preinstallWidget from "./preinstall"; import preinstallWidget from "./nodePage/preinstall.vue";
import agentWidget from "./agent"; import agentWidget from "./nodePage/agent.vue";
import cabinetWidget from "./cabinet"; import cabinetWidget from "./nodePage/cabinet/index.vue";
import cusDeclarationWidget from "./nodePage/cusDeclaration.vue";
import shipWidget from "./nodePage/ship.vue";
import subMaterialWidget from "./nodePage/subMaterial.vue";
import bargeWidget from "./nodePage/barge.vue";
import departureWidget from "./nodePage/departure.vue";
import blCopyWidget from "./nodePage/blCopy.vue";
import clrDocumentWidget from "./nodePage/clrDocument.vue";
import arrivalWidget from "./nodePage/arrival.vue";
import cusClearanceWidget from "./nodePage/cusClearance.vue";
import unloadingWidget from "./nodePage/unloading/index.vue";
/** /**
* 海运流程图 * 海运流程图
...@@ -55,6 +55,16 @@ export default { ...@@ -55,6 +55,16 @@ export default {
preinstallWidget, preinstallWidget,
agentWidget, agentWidget,
cabinetWidget, cabinetWidget,
cusDeclarationWidget,
shipWidget,
subMaterialWidget,
bargeWidget,
departureWidget,
blCopyWidget,
clrDocumentWidget,
arrivalWidget,
cusClearanceWidget,
unloadingWidget,
}, },
props: { props: {
shippingType: String, shippingType: String,
...@@ -66,9 +76,8 @@ export default { ...@@ -66,9 +76,8 @@ export default {
dialogConfig: { dialogConfig: {
dialogVisible: false, dialogVisible: false,
title: "", title: "",
width: "30%", width: "",
fullscreen: false, fullscreen: false,
type: "", // 标识
}, },
// 流程图节点 // 流程图节点
chartData: { chartData: {
...@@ -94,7 +103,7 @@ export default { ...@@ -94,7 +103,7 @@ export default {
{ {
unNode: true, unNode: true,
type: "agent", type: "agent",
title: "代理商设置", title: "AGENT",
}, },
], ],
[ [
...@@ -108,7 +117,7 @@ export default { ...@@ -108,7 +117,7 @@ export default {
{ {
title: "报关", title: "报关",
imgSrc: require("@/assets/images/shipping/bg-start.png"), imgSrc: require("@/assets/images/shipping/bg-start.png"),
type: "customsDeclaration", type: "cusDeclaration",
}, },
{ {
title: "配船", title: "配船",
...@@ -136,10 +145,20 @@ export default { ...@@ -136,10 +145,20 @@ export default {
}, },
], ],
[ [
{ /* {
title: "清关文件", title: "清关文件",
imgSrc: require("@/assets/images/shipping/qg-start.png"), imgSrc: require("@/assets/images/shipping/qg-start.png"),
type: "clearanceDocument", type: "clearanceDocument",
}, */
{
unNode: true,
type: "blCopy",
title: "提单Copy",
},
{
unNode: true,
type: "clrDocument",
title: "清关文件",
}, },
], ],
[ [
...@@ -153,7 +172,7 @@ export default { ...@@ -153,7 +172,7 @@ export default {
{ {
title: "清关", title: "清关",
imgSrc: require("@/assets/images/shipping/qg-start.png"), imgSrc: require("@/assets/images/shipping/qg-start.png"),
type: "customsClearance", type: "cusClearance",
}, },
], ],
[ [
...@@ -172,6 +191,8 @@ export default { ...@@ -172,6 +191,8 @@ export default {
], ],
], ],
}, },
// 当前组件
currentComponent: "",
}; };
}, },
methods: { methods: {
...@@ -181,21 +202,22 @@ export default { ...@@ -181,21 +202,22 @@ export default {
}, },
/** 节点点击 */ /** 节点点击 */
nodeClick(node) { nodeClick(node) {
this.currentComponent = `${node.type}Widget`;
this.$set(this.dialogConfig, "width", "500px");
this.$set(this.dialogConfig, "title", node.title); this.$set(this.dialogConfig, "title", node.title);
this.$set(this.dialogConfig, "fullscreen", false);
switch (node.type) { switch (node.type) {
// 订舱 // 订舱
case "booking": case "booking":
// 驳船
case "barge":
// 清关文件
case "clrDocument":
this.$set(this.dialogConfig, "width", "700px"); this.$set(this.dialogConfig, "width", "700px");
this.$set(this.dialogConfig, "fullscreen", false);
break; break;
// 拖车
case "trailer":
// AGENT // AGENT
case "agent": case "agent":
// 装柜 this.$set(this.dialogConfig, "title", "代理商设置");
case "cabinet":
this.$set(this.dialogConfig, "width", "500px");
this.$set(this.dialogConfig, "fullscreen", false);
break; break;
// 预装 // 预装
case "preinstall": case "preinstall":
...@@ -204,7 +226,6 @@ export default { ...@@ -204,7 +226,6 @@ export default {
break; break;
} }
this.$set(this.dialogConfig, "dialogVisible", true); this.$set(this.dialogConfig, "dialogVisible", true);
this.$set(this.dialogConfig, "type", node.type);
}, },
}, },
}; };
...@@ -220,18 +241,24 @@ export default { ...@@ -220,18 +241,24 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.node-div { .node-area {
margin-top: 10px; display: flex;
cursor: pointer; flex-direction: column;
p { align-items: center;
margin-top: -10px;
margin-bottom: 0px; .node-div {
text-align: center; margin-top: 10px;
cursor: pointer;
p {
margin-top: -10px;
margin-bottom: 0px;
text-align: center;
}
} }
} }
} .arrow-area {
.chart-arrow { margin: 0 10px;
margin: 0 10px; }
} }
} }
</style> </style>
src/views/ecw/box/shipping/shippingSea.vue → src/views/ecw/box/shippingSea/shippingSea.vue
View file @ 8b5d1375
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</template> </template>
<script> <script>
import shippingChart from "./shippingChart"; import shippingChart from "../shippingSea/seaProcess";
/** /**
* 海运操作主页面 * 海运操作主页面
*/ */
...@@ -57,5 +57,13 @@ export default { ...@@ -57,5 +57,13 @@ export default {
.operate-button { .operate-button {
text-align: center; text-align: center;
} }
.two-element{
.el-form-item__content {
display: flex;
> :last-child {
margin-left: 10px;
}
}
}
} }
</style> </style>
src/views/ecw/currencyEcash/index.vue
View file @ 8b5d1375
This diff is collapsed.
src/views/ecw/order/edit.vue
View file @ 8b5d1375
This diff is collapsed.
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