作者 shenhailong

处理 卡口 获取用户id

... ... @@ -12,6 +12,7 @@
"dependencies": {
"@xkeshi/vue-barcode": "^1.0.0",
"axios": "^0.19.0",
"common": "^0.2.5",
"echarts": "^3.3.2",
"element-ui": "^2.13.0",
"eslint": "^5.14.1",
... ...
export function formatDate(date, fmt) {
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
}
let o = {
'M+': date.getMonth() + 1,
'd+': date.getDate(),
'h+': date.getHours(),
'm+': date.getMinutes(),
's+': date.getSeconds()
};
for (let k in o) {
if (new RegExp(`(${k})`).test(fmt)) {
let str = o[k] + '';
fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
}
}
return fmt;
};
... ...
... ... @@ -46,8 +46,8 @@ export default {
login: data =>{
return axios({
method: 'POST', // 请求协议
url: 'cloud-user-center/login', // 请求的地址
// url: 'cloud-kako-user-center/login', // 请求的地址
// url: 'cloud-user-center/login', // 请求的地址
url: 'cloud-kako-user-center/login', // 请求的地址
data: qs.stringify(data), // post 请求的数据
timeout: 30000, // 超时时间, 单位毫秒
headers: {
... ...
... ... @@ -9,7 +9,13 @@ export const list = params => {return http.get(`${base}/businesstype/list`, para
export const aisleList = params => {return http.get(`${base}/businesstype/aisleList`, params);};
export const barCodeDel = params => {return http.get(`${base}/businesstype/barCodeDel`, params);};
export const remove = params => {return http.get(`${base}/businesstype/remove`, params);};
export const save = params => {return axios.post(`${base}/businesstype/save`, params);};
export const edit = params => {return axios.post(`${base}/businesstype/edit`, params);};
... ...
import http from './http.js'
let baseUrl = '/cloud-user-center/user'
// let baseUrl = '/cloud-kako-user-center/user'
// let baseUrl = '/cloud-user-center/user'
let baseUrl = '/cloud-kako-user-center/user'
let baseCode = '/cloud-kako-user-center/randCode'
export const getUserList = params => { return http.get(`${baseUrl}/list`, params); };
export const getRandCode = params => { return http.get(`${baseCode}`, params); };
export const getUserListPage = params => { return http.get(`/user/list`,params) };
export const removeUser = params => { return http.del(`${baseUrl}/del`,params)};
... ...
... ... @@ -8,6 +8,9 @@
<el-form-item prop="checkPass">
<el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input>
</el-form-item>
<!-- <el-form-item prop="checkPass">-->
<!-- <el-input type="password" v-model="ruleForm2.checkPass" placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input>-->
<!-- </el-form-item>-->
<el-checkbox v-model="checked" checked class="remeberme">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining" :plain="true">登录</el-button>
... ... @@ -34,6 +37,7 @@
<script>
import axios from 'axios'
import http from '../api/http';
import {getRandCode} from '../api/user';
//import NProgress from 'nprogress'
export default {
data() {
... ... @@ -43,7 +47,8 @@
logining: false,
ruleForm2: {
account: 'admin',
checkPass: 'vmvnv1v2VV'
checkPass: 'ZZJCsamples@123'
// checkPass: 'vmvnv1v2VV'
},
rules2: {
account: [
... ... @@ -96,6 +101,13 @@
// 本地存储用户目录 ,防刷新目录丢失用
sessionStorage.setItem('menu', JSON.stringify(_this.$router.options.routes));
},
randCode: function(){
getRandCode().then((res) =>{
}).catch({
});
},
handleSubmit2: function (ev) {
var _this = this;
this.$refs.ruleForm2.validate((valid) => {
... ... @@ -178,7 +190,8 @@
}
}
}
window.onresize()
window.onresize();
// this.randCode();
}
}
... ...
... ... @@ -54,7 +54,9 @@
v-loading="businesstypeListLoading"
style="width: 100%">
<el-table-column fixed prop="date" label="操作">
<el-button @click="handleClick(scope.row)" type="primary" size="small">查看</el-button>
<template slot-scope="scope">
<el-button @click="selectOne(scope.$index, scope.row)" type="primary" size="small">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效">
</el-table-column>
... ... @@ -62,9 +64,9 @@
</el-table-column>
<el-table-column prop="agentname" label="挂靠单位">
</el-table-column>
<el-table-column prop="endport" label="目的关区">
<el-table-column prop="endstation" :formatter="endstationName" label="目的场站" width="100">
</el-table-column>
<el-table-column prop="aisle" label="卡口" width="100">
<el-table-column prop="aisle" :formatter="aisleName" label="卡口" width="100">
</el-table-column>
<el-table-column prop="aislewt" label="地磅称重">
</el-table-column>
... ... @@ -88,10 +90,10 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="150">
<template slot-scope="scope">
<el-button type="success" size="mini">修改</el-button>
<el-button type="danger" size="mini">删除</el-button>
<el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button>
<el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>
<el-button type="warning" size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>
<el-button type="info" size="mini">异常</el-button>
<el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -108,12 +110,269 @@
:total="this.total">
</el-pagination>
</div>
<!-- 编辑表单信息-->
<el-dialog title="编辑" :visible.sync="editFormVisible" width="80%" height="80%" :close-on-click-modal="false">
<!-- 工具条-->
<el-row class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" ref="filtersForm" :model="filtersForm" :rules="rules" >
<el-row>
<el-col :span="8">
<el-form-item label="主单号:" prop="waybill">
<el-input v-model="filtersForm.waybill" placeholder="" size="small" style="width: 240px"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" @click="getWaybillList()" size="small" style="margin-left: 40px">查询</el-button>
<span style="color: red;margin-left: 10px">查询单号前请先选定业务类型</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
<!-- 列表-->
<el-row>
<el-table :data="awbaList" v-loading="commonLoading" style="width: 100%">
<el-table-column fixed label="操作">
<template slot-scope="scope">
<el-button @click="addWaybill(scope.$index, scope.row)" type="primary" size="small">添加</el-button>
</template>
</el-table-column>
<el-table-column prop="flightno" label="航班号">
<template slot-scope="scope">
<span v-if="scope.row.flightno.length > 4" >{{scope.row.flightno}}</span>
<span v-else>{{scope.row.carrier}}{{scope.row.flightno}}</span>
</template>
</el-table-column>
<el-table-column prop="flightDate" label="航班日期">
<template slot-scope="scope">
<span v-if="scope.row.flightDate !=null">{{scope.row.flightDate | formatDate}}</span>
<span v-else>{{scope.row.flightdate | formatDate}}</span>
</template>
</el-table-column>
<el-table-column prop="segment" label="航段">
<template slot-scope="scope">
<span v-if="scope.row.segment != null" >{{scope.row.segment}}</span>
<span v-else>{{scope.row.originatingstation}}-{{scope.row.destinationstation}}</span>
</template>
</el-table-column>
<el-table-column prop="waybillnomaster" label="主单号">
</el-table-column>
<el-table-column prop="totalpiece" label="件数">
</el-table-column>
<el-table-column prop="totalweight" label="重量">
</el-table-column>
<el-table-column prop="customscode" label="关区">
</el-table-column>
<el-table-column prop="createdate" :formatter="formatDate" label="时间">
</el-table-column>
<el-table-column prop="receiptinformation" label="回执内容" width="280px">
</el-table-column>
</el-table>
</el-row>
<el-form ref="editForm" :model="editForm">
<el-row>
<el-col :span="10">
<el-row>
<el-form-item label="输入备注:">
<el-input
type="text"
v-model="editForm.remark3"
maxlength="10"
show-word-limit
size="small" style="width: 180px">
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="车牌号码:" prop="trailerFrameNo">
<el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="货物类型:" prop="cocode">
<el-select v-model="editForm.cocode" placeholder="请选择" size="small" style="width: 180px">
<el-option label="转关货" value="转关货"></el-option>
<el-option label="换单货" value="换单货"></el-option>
<el-option label="普通货" value="普通货"></el-option>
<el-option label="退库货" value="退库货"></el-option>
<el-option label="查验货" value="查验货"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="场站选择:" prop="endstation">
<el-select v-model="editForm.endstation" disabled placeholder="请选择">
<el-option
v-for="item in options"
:key="item.stationId"
:label="item.name"
:value="item.stationId">
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="运输公司:">
<el-input v-model="editForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="挂靠单位:">
<el-input v-model="editForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
</el-col>
<el-col :span="7">
<el-row>
<el-form-item label="业务类型:" prop="businesstype">
<el-select v-model="editForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
<el-option label="进口提货" value="进口提货"></el-option>
<el-option label="出口送货" value="出口送货"></el-option>
<el-option label="分拨业务" value="分拨业务"></el-option>
<el-option label="调拨业务" value="调拨业务"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="申请单位:">
<el-input v-model="editForm.veProperty" disabled size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备案单位:">
<el-input v-model="editForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="主单列表:">
<el-input
type="textarea"
:rows="4"
placeholder="请输入主单号,例如17212341234,多个单号以‘,’(英文)分割"
v-model="editForm.masterList"
style="width: 180px">
</el-input>
</el-form-item>
</el-row>
</el-col>
</el-row>
<el-row style="margin-left: 320px">
<el-button type="primary" @click="editSubmit()" >保存</el-button>
</el-row>
</el-form>
</el-dialog>
<!-- 查看表单信息-->
<el-dialog title="查看" :visible.sync="selectOneVisible" width="80%" height="80%" :close-on-click-modal="false">
<el-form ref="editForm" :model="editForm">
<el-row>
<el-col :span="10">
<el-row>
<el-form-item label="输入备注:">
<el-input
type="text"
v-model="editForm.remark3"
maxlength="10"
show-word-limit
size="small" style="width: 180px">
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="车牌号码:" prop="trailerFrameNo">
<el-input v-model="editForm.trailerFrameNo" disabled placeholder="请输入车牌号" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="货物类型:" prop="cocode">
<el-select v-model="editForm.cocode" placeholder="请选择" size="small" style="width: 180px">
<el-option label="转关货" value="转关货"></el-option>
<el-option label="换单货" value="换单货"></el-option>
<el-option label="普通货" value="普通货"></el-option>
<el-option label="退库货" value="退库货"></el-option>
<el-option label="查验货" value="查验货"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="场站选择:" prop="endstation">
<el-select v-model="editForm.endstation" disabled placeholder="请选择">
<el-option
v-for="item in options"
:key="item.stationId"
:label="item.name"
:value="item.stationId">
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="运输公司:">
<el-input v-model="editForm.agentno" placeholder="" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="挂靠单位:">
<el-input v-model="editForm.agentname" placeholder="" size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
</el-col>
<el-col :span="7">
<el-row>
<el-form-item label="业务类型:" prop="businesstype">
<el-select v-model="editForm.businesstype" clearable placeholder="请选择" size="small" style="width: 180px">
<el-option label="进口提货" value="进口提货"></el-option>
<el-option label="出口送货" value="出口送货"></el-option>
<el-option label="分拨业务" value="分拨业务"></el-option>
<el-option label="调拨业务" value="调拨业务"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="申请单位:">
<el-input v-model="editForm.veProperty" disabled size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="备案单位:">
<el-input v-model="editForm.trailerLicenseNo" disabled size="small" style="width: 180px"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="主单列表:">
<el-input
type="textarea"
:rows="4"
placeholder="请输入主单号,例如17212341234,多个单号以‘,’(英文)分割"
v-model="editForm.masterList"
style="width: 180px">
</el-input>
</el-form-item>
</el-row>
</el-col>
</el-row>
</el-form>
</el-dialog>
</section>
</template>
<script>
import {list, aisleList} from '../../api/remote_interface/byont_import';
import {list, aisleList, barCodeDel, remove, edit} from '../../api/remote_interface/byont_import';
import {getYardList as yartList} from "../../api/station_dispatch";
export default {
filters: {
formatDate(value) {
if(value == null) {
return null
}
let dt = new Date(value)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
}
},
data() {
return {
businesstypeList: [],
... ... @@ -121,15 +380,54 @@
limitSize: 10,
total: 1,
options: [],
awbaList:[],
aisleOptions: [],
filtersForm: {
waybill: ''
},
disabled: true,
commonLoading: false,
editFormVisible: false,
selectOneVisible: false,
filters: {
trailerFrameNo: '',
agentname: '',
endstation: '',
aisle: '',
},
businesstypeListLoading: false
businesstypeListLoading: false,
editForm: {
// 备注
remark3: '',
// 业务类型
businesstype: '',
// 车牌号
trailerFrameNo: '',
//备案单位
trailerLicenseNo: '',
// 主单列表
masterList: '',
// 场站编号
endstation: '',
endstationList: '',
stationId: '',
// 运输公司
agentno: '',
// 挂靠单位
agentname: '',
//申请单位
veProperty: '',
// 货物类型
cocode:'',
// 货物重量
remark: ''
},
weightFloat: 0,
rules:{
waybill: [
{ required: true, message: '请输入运单号', trigger: 'change' }
]
},
}
},
methods: {
... ... @@ -141,6 +439,52 @@
return "失效"
}
},
aisleName: function(row, cloumn){
if (row.aisle=="4600010005"){
return "5号卡口-出"
}else if (row.aisle=="4600011005"){
return "5号卡口-进"
}else if (row.aisle=="4604333311"){
return "1号卡口-进"
}else if (row.aisle=="4604333312"){
return "1号卡口-出"
}else if (row.aisle=="4604444412"){
return "1号卡口-出"
}else if (row.aisle=="4600011006"){
return "6号卡口-进"
}else if (row.aisle=="4604110112"){
return "1号卡口-出"
}else if (row.aisle=="4612031001"){
return "内三卡口-进"
}else if (row.aisle=="4600010006"){
return "6号卡口-出"
}else if (row.aisle=="4604111111"){
return "1号卡口-进"
}else if (row.aisle=="4612030001"){
return "内三卡口-出"
}else if (row.aisle=="4604444411"){
return "1号卡口-进"
}else if (row.aisle=="4604333321"){
return "2号卡口-进"
}else if (row.aisle=="4604333322"){
return "2号卡口-出"
}
},
endstationName: function(row, cloumn){
if (row.endstation == "4604511001"){
return "快邮货站"
}else if (row.endstation == "4600329012"){
return "综保区货站"
}else if (row.endstation == "4604000000"){
return "西货站"
}else if (row.endstation == "4604000006"){
return "冷链货站"
}else if (row.endstation == "4604499001"){
return "三号货站"
}
},
turnoverflagFormatter: function(row, column){
if (row.turnoverflag == 'I'){
return "进场站"
... ... @@ -156,10 +500,13 @@
trailerFrameNo: this.filters.trailerFrameNo,
agentname: this.filters.agentname,
endstation: this.filters.endstation,
aisle: this.filters.aisle
aisle: this.filters.aisle,
userId: this.userid = JSON.parse(sessionStorage.getItem('user')).id
};
if(JSON.parse(sessionStorage.getItem('user')).roles[0].roleName == "ROLE_admin"){
para.userId = '';
}
this.businesstypeListLoading = true;
console.log(para);
list(para).then((res) => {
this.total = res.data.data.total;
this.businesstypeList = res.data.data.list;
... ... @@ -177,7 +524,6 @@
});
},
// 获取场站
getYardList(){
yartList().then((res) =>{
... ... @@ -213,9 +559,109 @@
});
},
onSubmit() {
console.log('submit!');
// 二维码异常处理
barCodeDelete(index, row) {
this.$confirm('确认处理吗?', '提示', {}).then(() => {
let para = {
trailerFrameNo: row.trailerFrameNo,
barCode: row.barcode
}
barCodeDel(para).then((res) =>{
this.$message({
message: res.data.msg,
type: 'success'
});
this.getList();
}).catch((error)=>{
this.$message({
message: error,
type: 'error'
});
});
}).catch(() =>{
});
},
// 删除
deleteClick(index, row){
this.$confirm('确认删除吗?', '提示', {}).then(() => {
let para = {
id: row.id,
}
remove(para).then((res) =>{
this.$message({
message: res.data.msg,
type: 'success'
});
this.getList();
}).catch((error)=>{
this.$message({
message: error,
type: 'error'
});
});
}).catch(() =>{
});
},
// 修改
opneEdit(index, row){
this.editFormVisible = true;
if (this.$refs.filtersForm !== undefined) {
this.$refs.filtersForm.resetFields();
}
this.editForm = Object.assign({}, row);
},
// 查看
selectOne(index, row){
this.selectOneVisible = true;
this.editForm = Object.assign({}, row);
},
// 运单列表赋值
addWaybill: function(index, row){
this.editForm.masterList += row.waybillnomaster + ',';
},
// 运单查询
getWaybillList(){
let businesstype = this.editForm.businesstype;
if (businesstype != undefined && businesstype != null && businesstype != ''){
this.$refs.filtersForm.validate((valid) => {
if (valid) {
this.commonLoading = true;
let _this = this;
var url = "http://tjfx.15miaoo.com:8003/orig/orig";
var xhr = new XMLHttpRequest();
// 访问nginx中的代理服务器
xhr.open('get', url+'?waybill='+this.filtersForm.waybill+'&imp='+this.getBusinesstype(), true);
xhr.send();
xhr.onreadystatechange = function(){
if(xhr.readyState == 4){
if(xhr.status ==200){
var data = JSON.parse(xhr.responseText);
_this.awbaList=data;
//console.log(data);
_this.commonLoading = false;
}
}
}
} else {
console.log('error submit!!');
return false;
}
});
}else {
this.$message({
message: '请在下列选择业务类型',
type: "error"
})
}
},
// 分页
handleSizeChange(val) {
this.limitSize = val;
this.getList();
... ... @@ -224,11 +670,145 @@
this.pageSize = val;
this.getList();
},
// 日期格式转换
flightDate: function (row, column) {
// 获取单元格数据
let data = row.flightDate
if(data == null) {
return null
}
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
},
formatDate: function (row, column) {
// 获取单元格数据
let data = row.createdate;
if(data == null) {
return null
}
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()+ ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds();
},
editweight(){
var _this = this;
// 运单重量累加
let lists = _this.wayBillList();
var split = lists.split(",");
_this.weightFloat = 0;
// 判断进出港 进出港返回字段不一样
if(_this.getBusinesstype() == "I"){
split.forEach((item) =>{
var url = "http://tjfx.15miaoo.com:8003/orig/orig";
var xhr = new XMLHttpRequest();
// 访问nginx中的代理服务器
xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
xhr.send();
xhr.onreadystatechange = function(){
if(xhr.readyState == 4){
if(xhr.status ==200){
var data = JSON.parse(xhr.responseText);
data.forEach((itmeData => {
if (itmeData != null){
_this.weightFloat += parseFloat(itmeData.manifesttotalweight);
}
}));
}
}
}
});
}else {
split.forEach((item) =>{
var url = "http://tjfx.15miaoo.com:8003/orig/orig";
var xhr = new XMLHttpRequest();
// 访问nginx中的代理服务器
xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
xhr.send();
xhr.onreadystatechange = function(){
if(xhr.readyState == 4){
if(xhr.status ==200){
var data = JSON.parse(xhr.responseText);
data.forEach((itmeData => {
if (itmeData != null){
_this.weightFloat += parseFloat(itmeData.preparetotalweight);
}
}));
}
}
}
});
}
return _this.weightFloat;
},
editsubmit(){
this.editForm.masterList = this.wayBillList();
this.editForm.remark = this.weightFloat.toString();
let para = Object.assign({}, this.editForm);
edit(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.editFormVisible = false;
this.getList();
}else {
this.$message({
message: '提交失败',
type: 'error'
});
}
}).catch(error => alert(error));
},
getBusinesstype:function(){
let businesstype = this.editForm.businesstype;
if (businesstype == '进口提货'){
businesstype = 'I';
}else if (businesstype == '出口送货'){
businesstype = 'E';
}else if (businesstype == '分拨业务'){
businesstype = 'I';
}else if (businesstype == '调拨业务'){
businesstype = 'E';
}
return businesstype;
},
// 添加页面主单列表 结尾逗号处理
wayBillList:function () {
if (this.editForm.masterList.endsWith(",")){
return this.editForm.masterList.substring(0,this.editForm.masterList.length-1);
}else {
return this.editForm.masterList
}
},
// 申请添加
editSubmit (){
let _this = this;
this.$refs.editForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
_this.editsubmit();
}).catch(() =>{
});
} else {
return false;
}
});
}
},
mounted() {
this.getYardList();
this.getList();
},
watch: {
'editForm.masterList':{
handler: function() {
this.editForm.remark = "";
this.editForm.masterList = this.editForm.masterList.replaceAll(",",",");
this.editweight();
},
}
}
}
</script>
... ...
... ... @@ -27,10 +27,22 @@
</template>
</el-table-column>
<el-table-column prop="flightno" label="航班号">
<template slot-scope="scope">
<span v-if="scope.row.flightno.length > 4" >{{scope.row.flightno}}</span>
<span v-else>{{scope.row.carrier}}{{scope.row.flightno}}</span>
</template>
</el-table-column>
<el-table-column prop="flightDate" :formatter="flightDate" label="航班日期">
<el-table-column prop="flightDate" label="航班日期">
<template slot-scope="scope">
<span v-if="scope.row.flightDate !=null">{{scope.row.flightDate | formatDate}}</span>
<span v-else>{{scope.row.flightdate | formatDate}}</span>
</template>
</el-table-column>
<el-table-column prop="segment" label="航段">
<template slot-scope="scope">
<span v-if="scope.row.segment != null" >{{scope.row.segment}}</span>
<span v-else>{{scope.row.originatingstation}}-{{scope.row.destinationstation}}</span>
</template>
</el-table-column>
<el-table-column prop="waybillnomaster" label="主单号">
</el-table-column>
... ... @@ -138,8 +150,8 @@
</el-col>
</el-row>
<el-row style="margin-left: 320px">
<!-- <el-button type="primary" @click="saveSubmit()" :disabled="disabledStr">保存</el-button>-->
<el-button type="primary" @click="saveSubmit()" :disabledStr="disabledStr" >保存</el-button>
<el-button type="primary" @click="saveSubmit()" :disabled="disabledStr">保存</el-button>
<!-- <el-button type="primary" @click="saveSubmit()" :disabledStr="disabledStr" >保存</el-button>-->
</el-row>
</el-form>
... ... @@ -150,9 +162,19 @@
<script>
import {getYardList as yartList} from '../../api/station_dispatch'
import {trailerFrameNoSuccess, save} from '../../api/remote_interface/byont_import'
// import {formatDate} from '../../api/comcommonUtil'
import loginUserInfo from "../../api/base";
import {add} from "../../api/security/security";
export default {
filters: {
formatDate(value) {
if(value == null) {
return null
}
let dt = new Date(value)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
}
},
data() {
return {
rules:{
... ... @@ -176,7 +198,7 @@
},
options:[],
filters: {
waybill: '828-12161085',
waybill: ''
},
radio:'',
awbaList:[],
... ... @@ -189,9 +211,9 @@
// 备注
remark3: '',
// 业务类型
businesstype: '进口提货',
businesstype: '',
// 车牌号
trailerFrameNo: '苏H63D50',
trailerFrameNo: '',
//备案单位
trailerLicenseNo: '',
// 主单列表
... ... @@ -208,8 +230,10 @@
// 货物类型
cocode:'',
// 货物重量
remark: ''
remark: '',
createBy: this.userid = JSON.parse(sessionStorage.getItem('user')).id
},
weightFloat: 0
}
},
... ... @@ -317,16 +341,6 @@
});
},
// 日期格式转换
flightDate: function (row, column) {
// 获取单元格数据
let data = row.flightDate
if(data == null) {
return null
}
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate();
},
formatDate: function (row, column) {
// 获取单元格数据
let data = row.createdate;
... ... @@ -343,8 +357,31 @@
addweight(){
var _this = this;
// 运单重量累加
let lists =this.addForm.masterList.substring(0,this.addForm.masterList.length-1);
let lists = _this.wayBillList();
var split = lists.split(",");
_this.weightFloat = 0;
// 判断进出港 进出港返回字段不一样
if(_this.getBusinesstype() == "I"){
split.forEach((item) =>{
var url = "http://tjfx.15miaoo.com:8003/orig/orig";
var xhr = new XMLHttpRequest();
// 访问nginx中的代理服务器
xhr.open('get', url+'?waybill='+item+'&imp='+_this.getBusinesstype(), true);
xhr.send();
xhr.onreadystatechange = function(){
if(xhr.readyState == 4){
if(xhr.status ==200){
var data = JSON.parse(xhr.responseText);
data.forEach((itmeData => {
if (itmeData != null){
_this.weightFloat += parseFloat(itmeData.manifesttotalweight);
}
}));
}
}
}
});
}else {
split.forEach((item) =>{
var url = "http://tjfx.15miaoo.com:8003/orig/orig";
var xhr = new XMLHttpRequest();
... ... @@ -356,15 +393,20 @@
if(xhr.status ==200){
var data = JSON.parse(xhr.responseText);
data.forEach((itmeData => {
_this.addForm.remark += itmeData.manifesttotalweight+",";
if (itmeData != null){
_this.weightFloat += parseFloat(itmeData.preparetotalweight);
}
}));
}
}
}
});
return _this.addForm.remark;
}
return _this.weightFloat;
},
addsubmit(){
this.addForm.masterList = this.wayBillList();
this.addForm.remark = this.weightFloat.toString();
let para = Object.assign({}, this.addForm);
save(para).then((res) => {
if (res.data.code == 200){
... ... @@ -400,32 +442,7 @@
this.$refs.addForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗?', '提示', {}).then(() => {
let businesstype = _this.getBusinesstype();
if (this.addForm.masterList.indexOf(",") !== -1){
_this.addsubmit();
}else {
console.log("进入远程调用");
let sum = 0;
var url = "http://tjfx.15miaoo.com:8003/orig/orig";
var xhr = new XMLHttpRequest();
// 访问nginx中的代理服务器
xhr.open('get', url+'?waybill='+this.addForm.masterList+'&imp='+businesstype, true);
xhr.send();
xhr.onreadystatechange = function(){
if(xhr.readyState == 4){
if(xhr.status ==200){
var data = JSON.parse(xhr.responseText);
data.forEach((itme => {
_this.addForm.remark += parseInt(itme.manifesttotalweight);
}));
}
}
}
}
console.log(_this.addForm.remark);
console.log(_this.addForm);
}).catch(() =>{
});
... ... @@ -434,6 +451,14 @@
return false;
}
});
},
// 添加页面主单列表 结尾逗号处理
wayBillList:function () {
if (this.addForm.masterList.endsWith(",")==true){
return this.addForm.masterList.substring(0,this.addForm.masterList.length-1);
}else {
return this.addForm.masterList
}
}
},
mounted() {
... ... @@ -446,7 +471,6 @@
handler: function() {
this.addForm.remark = "";
this.addForm.masterList = this.addForm.masterList.replaceAll(",",",");
console.log("运单列表变了"+this.addForm.masterList);
this.addweight();
},
}
... ...
... ... @@ -30,7 +30,7 @@
<el-table-column type="index" align="center"></el-table-column>
<el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column>
<el-table-column label="区域代码" prop="areaCode" align="center" width="120"></el-table-column>
<el-table-column label="场站ID" prop="stationId" align="center" width="120"></el-table-column>
<el-table-column label="场站编号" prop="stationId" align="center" width="120"></el-table-column>
<el-table-column label="关区代码" prop="customsCode" align="center" width="120"></el-table-column>
<el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>
<el-table-column label="操作" width="140px" align="center">
... ... @@ -86,7 +86,7 @@
placeholder="请输入区域代码">
</el-input>
</el-form-item>
<el-form-item label="场站ID:" prop="stationId">
<el-form-item label="场站编号:" prop="stationId">
<el-input v-model="yard_addForm.stationId" style="width:300px" size="mini" clearable
placeholder="请输入场站ID">
</el-input>
... ... @@ -138,7 +138,7 @@
placeholder="请输入区域代码">
</el-input>
</el-form-item>
<el-form-item label="场站ID:" prop="stationId">
<el-form-item label="场站编号:" prop="stationId">
<el-input v-model="yard_editForm.stationId" style="width:300px" size="mini" clearable
placeholder="请输入场站ID">
</el-input>
... ...