Skip to content

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

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

parents 8814f70d 457d8c36
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1255 additions and 654 deletions
src/api/ecw/customerContacts.js
View file @ 6ef158aa
...@@ -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 @ 6ef158aa
...@@ -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 @ 6ef158aa
<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 @ 6ef158aa
<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 @ 6ef158aa
...@@ -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/utils/dict.js
View file @ 6ef158aa
...@@ -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 ECASH_INIT:'ecash_init', //e-cash
} }
/** /**
......
src/views/ecw/box/shippingSea/nodePage/agent.vue
View file @ 6ef158aa
<template> <template>
<div> <div>
<el-form ref="agentForm" :rules="rules" :model="agentObj" 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="agentObj.agent" placeholder="请选择代理商"> <el-select v-model="agentObj.agent" placeholder="请选择代理商">
</el-select> </el-select>
......
src/views/ecw/box/shippingSea/nodePage/arrival.vue 0 → 100644
View file @ 6ef158aa
<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/clearanceDocument.vue → src/views/ecw/box/shippingSea/nodePage/clrDocument.vue
View file @ 6ef158aa
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
* 清关文件 * 清关文件
*/ */
export default { export default {
name: "clearanceDocument", name: "clrDocument",
data() { data() {
return { return {
// 清关文件对象 // 清关文件对象
......
src/views/ecw/box/shippingSea/nodePage/cusClearance.vue 0 → 100644
View file @ 6ef158aa
<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/customsClearance.vue → src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @ 6ef158aa
<template> <template>
<div> <div>
<el-form ref="cusClearanceForm" :rules="rules" :model="cusClearance" label-width="120px"> <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 label="单证要求">我司全代 <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">VGM声明</el-button>
</el-form-item> </el-form-item>
<el-form-item label="柜重" prop="cabinetWeight"> <el-form-item label="柜重" prop="cabinetWeight">
<el-input v-model="cusClearance.cabinetWeight" placeholder="请输入柜重" clearable /> <el-input v-model="cusDeclaration.cabinetWeight" placeholder="请输入柜重" clearable />
</el-form-item> </el-form-item>
<el-form-item label="货重" prop="cargoWeight"> <el-form-item label="货重" prop="cargoWeight">
<el-input v-model="cusClearance.cargoWeight" placeholder="请输入货重" clearable /> <el-input v-model="cusDeclaration.cargoWeight" placeholder="请输入货重" clearable />
</el-form-item> </el-form-item>
<el-form-item label="VGM重量（柜重+货重）"> <el-form-item label="VGM重量（柜重+货重）">
<el-input v-model="cusClearance.vgmWeight" placeholder="请输入VGM重量" clearable /> <el-input v-model="cusDeclaration.vgmWeight" placeholder="请输入VGM重量" clearable />
</el-form-item> </el-form-item>
<el-form-item label="报关方式" prop="method"> <el-form-item label="报关方式" prop="method">
<el-select v-model="cusClearance.method" placeholder="请选择报关方式"> <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-option v-for="item in methods" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="正常报关订单"> <el-form-item label="正常报关订单">
</el-form-item> </el-form-item>
<el-form-item label="报关公司名称"> <el-form-item label="报关公司名称">
<el-select v-model="cusClearance.companyName" placeholder="请选择报关公司名称"> <el-select v-model="cusDeclaration.companyName" placeholder="请选择报关公司名称">
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="截关时间"> <el-form-item label="截关时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusClearance.cutTime"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclaration.cutTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="cusClearance.status"> <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 v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<!-- 查验 --> <!-- 查验 -->
<div v-show="cusClearance.status === '3'"> <div v-show="cusDeclaration.status === '3'">
<el-form-item label="查验"> <el-form-item label="查验">
<el-radio-group v-model="cusClearance.check"> <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 v-for="item in checkItems" :key="item.value" :label="item.value">{{item.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</div> </div>
<!-- 退场 --> <!-- 退场 -->
<div v-show="cusClearance.check === '1' || cusClearance.check === '2'"> <div v-show="cusDeclaration.check === '1' || cusDeclaration.check === '2'">
<el-form-item label="查验时间"> <el-form-item label="查验时间">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusClearance.checkTime"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclaration.checkTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="查验前图片"> <el-form-item label="查验前图片">
<el-upload action="" :limit="1" :file-list="cusClearance.checkFile"> <el-upload action="" :limit="1" :file-list="cusDeclaration.checkFile">
<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-item label="新封条"> <el-form-item label="新封条">
<el-input v-model="cusClearance.newSeal" placeholder="请输入新封条" clearable /> <el-input v-model="cusDeclaration.newSeal" placeholder="请输入新封条" clearable />
</el-form-item> </el-form-item>
</div> </div>
<!-- 放行 --> <!-- 放行 -->
<el-form-item label="放行时间" v-show="cusClearance.status === '2' || cusClearance.check === '2'"> <el-form-item label="放行时间" v-show="cusDeclaration.status === '2' || cusDeclaration.check === '2'">
<el-date-picker type="date" placeholder="请选择日期" v-model="cusClearance.releaseTime"></el-date-picker> <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclaration.releaseTime"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="装箱单"> <el-form-item label="装箱单">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<el-form label-width="100px"> <el-form label-width="100px">
<el-form-item label="订单号" class="two-element"> <el-form-item label="订单号" class="two-element">
<el-input v-model="orderNo" placeholder="请输入订单号" clearable /> <el-input v-model="orderNo" placeholder="请输入订单号" clearable />
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row> </el-row>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
* 报关 * 报关
*/ */
export default { export default {
name: "customsClearance", name: "cusDeclaration",
data() { data() {
return { return {
// 报关方式 // 报关方式
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
}, },
], ],
// 报关对象 // 报关对象
cusClearance: {}, cusDeclaration: {},
// 校验 // 校验
rules: { rules: {
cabinetWeight: [{ required: true, message: "必填", trigger: "change" }], cabinetWeight: [{ required: true, message: "必填", trigger: "change" }],
...@@ -201,16 +201,16 @@ export default { ...@@ -201,16 +201,16 @@ export default {
}; };
}, },
watch: { watch: {
"cusClearance.status"(val) { "cusDeclaration.status"(val) {
if (val !== "3") { if (val !== "3") {
this.$set(this.cusClearance, "check", ""); this.$set(this.cusDeclaration, "check", "");
} }
}, },
}, },
methods: { methods: {
/** 提交 */ /** 提交 */
onSubmit() { onSubmit() {
this.$refs["cusClearanceForm"].validate((valid) => { this.$refs["cusDeclarationForm"].validate((valid) => {
if (valid) { if (valid) {
alert("submit!"); alert("submit!");
} }
......
src/views/ecw/box/shippingSea/nodePage/departure.vue
View file @ 6ef158aa
...@@ -17,62 +17,31 @@ ...@@ -17,62 +17,31 @@
<el-row class="operate-button"> <el-row class="operate-button">
<el-button type="primary">保存</el-button> <el-button type="primary">保存</el-button>
<el-button type="success" @click="onSubmit('departureForm')">提交</el-button> <el-button type="success" @click="onSubmit">提交</el-button>
<el-button @click="cancel">关闭</el-button> <el-button @click="cancel">关闭</el-button>
<el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button> <el-button type="primary" @click="exceptionReg" :disabled="!showMsg">异常登记</el-button>
</el-row> </el-row>
<!-- 对话框 --> <!-- 对话框 -->
<el-dialog custom-class="shipping-dialog departure" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close> <el-dialog custom-class="shipping-dialog" title="票异常" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
<el-form ref="errorForm" :model="errorObj" label-width="140px"> <regError @closeDialog="dialogVisible = false" />
<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('errorForm')">提交</el-button>
<el-button @click="dialogVisible = false;">关闭</el-button>
</el-row>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import regError from "./regError";
/** /**
* 起运 * 起运
*/ */
export default { export default {
name: "departure", name: "departure",
components: { regError },
data() { data() {
return { return {
// 起运对象 // 起运对象
departureObj: {}, departureObj: {},
// 异常对象
errorObj: {},
// 校验 // 校验
rules: { rules: {
arrivalTime: [{ required: true, message: "必填", trigger: "change" }], arrivalTime: [{ required: true, message: "必填", trigger: "change" }],
...@@ -81,17 +50,6 @@ export default { ...@@ -81,17 +50,6 @@ export default {
dialogVisible: false, dialogVisible: false,
// 提示消息 // 提示消息
showMsg: false, showMsg: false,
// 是否更新订单动态
status: [
{
value: "1",
label: "是",
},
{
value: "2",
label: "否",
},
],
}; };
}, },
watch: { watch: {
...@@ -121,8 +79,8 @@ export default { ...@@ -121,8 +79,8 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
}, },
/** 提交 */ /** 提交 */
onSubmit(formName) { onSubmit() {
this.$refs[formName].validate((valid) => { this.$refs["departureForm"].validate((valid) => {
if (valid) { if (valid) {
alert("submit!"); alert("submit!");
} }
......
src/views/ecw/box/shippingSea/nodePage/regError.vue 0 → 100644
View file @ 6ef158aa
<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/unloading/index.vue 0 → 100644
View file @ 6ef158aa
<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 @ 6ef158aa
<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 @ 6ef158aa
<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/shippingSea/seaProcess.vue
View file @ 6ef158aa
...@@ -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)">{{node.title}}</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,47 +22,27 @@ ...@@ -22,47 +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'" />
<!-- 报关 -->
<customsClearanceWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'customsDeclaration'" />
<!-- 配船 -->
<shipWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'ship'" />
<!-- 提单材料 -->
<subMaterialWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'subMaterial'" />
<!-- 驳船 -->
<bargeWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'barge'" />
<!-- 起运 -->
<departureWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'departure'" />
<!-- 提单copy -->
<blCopyWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'blCopy'" />
<!-- 清关文件 -->
<clearanceDocumentWidget @closeDialog="closeDialog" v-if="dialogConfig.type === 'clearanceDocument'" />
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import bookingWidget from "./nodePage/booking"; import bookingWidget from "./nodePage/booking.vue";
import trailerWidget from "./nodePage/trailer"; import trailerWidget from "./nodePage/trailer.vue";
import preinstallWidget from "./nodePage/preinstall"; import preinstallWidget from "./nodePage/preinstall.vue";
import agentWidget from "./nodePage/agent"; import agentWidget from "./nodePage/agent.vue";
import cabinetWidget from "./nodePage/cabinet"; import cabinetWidget from "./nodePage/cabinet/index.vue";
import customsClearanceWidget from "./nodePage/customsClearance"; import cusDeclarationWidget from "./nodePage/cusDeclaration.vue";
import shipWidget from "./nodePage/ship"; import shipWidget from "./nodePage/ship.vue";
import subMaterialWidget from "./nodePage/subMaterial"; import subMaterialWidget from "./nodePage/subMaterial.vue";
import bargeWidget from "./nodePage/barge"; import bargeWidget from "./nodePage/barge.vue";
import departureWidget from "./nodePage/departure"; import departureWidget from "./nodePage/departure.vue";
import blCopyWidget from "./nodePage/blCopy"; import blCopyWidget from "./nodePage/blCopy.vue";
import clearanceDocumentWidget from "./nodePage/clearanceDocument"; 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";
/** /**
* 海运流程图 * 海运流程图
...@@ -75,13 +55,16 @@ export default { ...@@ -75,13 +55,16 @@ export default {
preinstallWidget, preinstallWidget,
agentWidget, agentWidget,
cabinetWidget, cabinetWidget,
customsClearanceWidget, cusDeclarationWidget,
shipWidget, shipWidget,
subMaterialWidget, subMaterialWidget,
bargeWidget, bargeWidget,
departureWidget, departureWidget,
blCopyWidget, blCopyWidget,
clearanceDocumentWidget, clrDocumentWidget,
arrivalWidget,
cusClearanceWidget,
unloadingWidget,
}, },
props: { props: {
shippingType: String, shippingType: String,
...@@ -93,9 +76,8 @@ export default { ...@@ -93,9 +76,8 @@ export default {
dialogConfig: { dialogConfig: {
dialogVisible: false, dialogVisible: false,
title: "", title: "",
width: "30%", width: "",
fullscreen: false, fullscreen: false,
type: "", // 标识
}, },
// 流程图节点 // 流程图节点
chartData: { chartData: {
...@@ -135,7 +117,7 @@ export default { ...@@ -135,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: "配船",
...@@ -175,7 +157,7 @@ export default { ...@@ -175,7 +157,7 @@ export default {
}, },
{ {
unNode: true, unNode: true,
type: "clearanceDocument", type: "clrDocument",
title: "清关文件", title: "清关文件",
}, },
], ],
...@@ -190,7 +172,7 @@ export default { ...@@ -190,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",
}, },
], ],
[ [
...@@ -209,6 +191,8 @@ export default { ...@@ -209,6 +191,8 @@ export default {
], ],
], ],
}, },
// 当前组件
currentComponent: "",
}; };
}, },
methods: { methods: {
...@@ -218,32 +202,23 @@ export default { ...@@ -218,32 +202,23 @@ 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 "barge":
// 清关文件 // 清关文件
case "clearanceDocumentWidget": case "clrDocument":
this.$set(this.dialogConfig, "width", "700px"); this.$set(this.dialogConfig, "width", "700px");
this.$set(this.dialogConfig, "fullscreen", false);
break; break;
// AGENT // AGENT
case "agent": case "agent":
this.$set(this.dialogConfig, "title", "代理商设置"); this.$set(this.dialogConfig, "title", "代理商设置");
break; break;
// 拖车
case "trailer":
// 装柜
case "cabinet":
// 报关
case "customsDeclaration":
// 起运
case "departure":
this.$set(this.dialogConfig, "width", "500px");
this.$set(this.dialogConfig, "fullscreen", false);
break;
// 预装 // 预装
case "preinstall": case "preinstall":
this.$set(this.dialogConfig, "fullscreen", true); this.$set(this.dialogConfig, "fullscreen", true);
...@@ -251,7 +226,6 @@ export default { ...@@ -251,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);
}, },
}, },
}; };
...@@ -267,6 +241,11 @@ export default { ...@@ -267,6 +241,11 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.node-area {
display: flex;
flex-direction: column;
align-items: center;
.node-div { .node-div {
margin-top: 10px; margin-top: 10px;
cursor: pointer; cursor: pointer;
...@@ -277,8 +256,9 @@ export default { ...@@ -277,8 +256,9 @@ export default {
} }
} }
} }
.chart-arrow { .arrow-area {
margin: 0 10px; margin: 0 10px;
} }
}
} }
</style> </style>
src/views/ecw/currencyEcash/index.vue
View file @ 6ef158aa
This diff is collapsed.
src/views/ecw/order/edit.vue
View file @ 6ef158aa
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