Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4bdcdb26 1 parent 35f92e54

bug修复

Inline Side-by-side
Showing 9 changed files with 425 additions and 854 deletions
import service from "../utils/request";
import request from '@/utils/request'
//航班预审模板下载
/**
* @param
*/
export function downLoadTemplate(template) {
return request({
url:'/caPreReviewImport/downLoadTemplate?template=' + template,
......@@ -9,6 +12,11 @@ export function downLoadTemplate(template) {
})
}
//预审回执导入
/**
* @param file 文件 *
* @param type 状态 *
*/
export function importcaPreReview(file, type){
let formData = new FormData();
formData.append("file", file);
......
import request from '@/utils/request'
// 货物查询查询条件数据
//货物查询查询条件数据
/**
* @param
*/
export function findConditionData(data) {
return request({
url: '/cargo/findConditionData',
......@@ -10,6 +13,9 @@ export function findConditionData(data) {
}
//货物查询
/**
* @param
*/
export function findCargoData(data) {
return request({
url: '/cargo/findCargoData',
......@@ -53,3 +59,12 @@ export function downloadExcel(data) {
responseType: 'blob',
})
}
//释放仓位
export function releaseCargo(data) {
return request({
url: '/cargo/releaseCargo',
method: 'post',
data: data,
})
}
\ No newline at end of file
......
......@@ -31,7 +31,6 @@ export function delFlight(data) {
return request({
url: '/FlightPreserveController/delFlight/'+ data,
method: 'post'
})
}
//新增修改
......@@ -61,3 +60,12 @@ export function updateStatusBatch(data){
data: data
})
}
//自动推送开关
export function updateAutoPushBatch(data){
return request({
url: '/FlightPreserveController/updateAutoPushBatch',
method: 'post',
data: data
})
}
......
import service from "../utils/request";
import request from '@/utils/request'
// 查询航班种类
......
......@@ -93,6 +93,13 @@ import { praseStrEmpty } from "@/utils/FedEx";
// }
// 查询用户列表
/**
* @param page 页码 *
* @param size 数据长度 *
* @param isValid 用户状态
* @param username 用户名
* @param phone 手机号码
*/
export function listUser(data) {
return request({
url: '/sysUser/getUserList',
......@@ -102,6 +109,9 @@ export function listUser(data) {
}
// 查询用户详细
/**
* @param id 用户id *
*/
export function detailUser(userId) {
return request({
url: '/sysUser/detailUser?id=' + praseStrEmpty(userId),
......@@ -110,6 +120,15 @@ export function detailUser(userId) {
}
// 新增用户
/**
* @param loginName 员工号 *
* @param username 用户姓名 *
* @param phone 手机号
* @param email 电子邮箱
* @param portName 所属口岸 *
* @param roleIds 所属角色 *
* @param remark 备注
*/
export function addOrUpdateUser(data) {
return request({
url: '/sysUser/addOrUpdateUser',
......@@ -119,6 +138,16 @@ export function addOrUpdateUser(data) {
}
// 修改用户状态
/**
* @param id 用户id *
* @param loginName 员工号 *
* @param username 用户姓名 *
* @param phone 手机号
* @param email 电子邮箱
* @param portName 所属口岸 *
* @param roleIds 所属角色 *
* @param remark 备注
*/
export function updateUserStatus(data) {
return request({
url: '/sysUser/updateUserStatus',
......@@ -128,6 +157,9 @@ export function updateUserStatus(data) {
}
//菜单信息
/**
* @param
*/
export function getAllAuth() {
return request({
url: '/sysMenu/getAllAuth',
......@@ -136,6 +168,10 @@ export function getAllAuth() {
}
//菜单开启关闭
/**
* @param id 菜单id *
* @param status 菜单状态 *
*/
export function updateStatus(data) {
return request({
url: '/sysMenu/updateStatus',
......@@ -145,6 +181,14 @@ export function updateStatus(data) {
}
//角色列表
/**
* @param name 角色名称
* @param size 数据长度 *
* @param page 页码 *
* @param createStart 创建开始时间
* @param createEnd 创建结束时间
* @param valid 角色状态
*/
export function getRoleList(data) {
return request({
url: '/role/getRoleList',
......@@ -154,6 +198,9 @@ export function getRoleList(data) {
}
//角色详情
/**
* @param id 角色id *
*/
export function detailRole(id) {
return request({
url: '/role/detailRole?id=' + id,
......@@ -162,6 +209,13 @@ export function detailRole(id) {
}
//新增修改角色
/**
* @param id 角色id *
* @param name 角色名 *
* @param remark 角色描述
* @param menuIds 角色权限
* @param valid 角色状态
*/
export function addOrUpdateRole(data) {
return request({
url: '/role/addOrUpdateRole',
......@@ -171,6 +225,10 @@ export function addOrUpdateRole(data) {
}
//角色状态修改
/**
* @param id 角色id *
* @param valid 角色状态 *
*/
export function updateRoleStatus(data) {
return request({
url: '/role/updateRoleStatus',
......@@ -180,6 +238,9 @@ export function updateRoleStatus(data) {
}
//口岸列表
/**
* @param
*/
export function portNameList() {
return request({
url: '/dictionary/port',
......@@ -188,6 +249,9 @@ export function portNameList() {
}
//口岸变更
/**
* @param
*/
export function changeCurrentPort(data) {
return request({
url: '/sysUser/changeCurrentPort',
......
<template>
<div class="w-table" :class="{ 'w-table_moving': dragState.dragging }">
<el-table
:ref="tableName"
:data="data"
:border="border"
:stripe="stripe"
:size="size"
:fit="fit"
:indent="indent"
:show-header="showHeader"
:height="height"
:highlight-current-row="highlightCurrentRow"
:lazy="lazy"
:downShiftKey="shiftKey"
:limitStart="limitStart"
:row-key="rowKey"
:default-expand-all="defaultExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
v-loading="loading"
:cell-class-name="cellClassName"
:header-cell-class-name="headerCellClassName"
@sort-change="sortChange"
@select="tableSelect"
@select-all="tableSelectAll"
@select-change="SelectChange"
>
<el-table :ref="tableName" :data="data" :border="border" :stripe="stripe" :size="size" :fit="fit" :indent="indent"
:show-header="showHeader" :height="height" :highlight-current-row="highlightCurrentRow" :lazy="lazy"
:downShiftKey="shiftKey" :limitStart="limitStart" :row-key="rowKey" :default-expand-all="defaultExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading"
:cell-class-name="cellClassName" :header-cell-class-name="headerCellClassName" @sort-change="sortChange"
@select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange">
<!-- 复选框 -->
<el-table-column
v-if="selection"
type="selection"
:fixed="true"
width="50"
align="center"
></el-table-column>
<el-table-column v-if="selection" type="selection" :fixed="true" width="50" align="center"></el-table-column>
<!-- 序号 -->
<el-table-column type="index" width="50" align="center"></el-table-column>
<template v-for="(item, index) in newHeader">
<!-- 自定义插槽 -->
<el-table-column
v-if="item.slot"
:prop="item.value"
:label="item.name"
:width="item.width"
:align="item.align"
:fixed="item.fixed"
:show-overflow-tooltip="showOverflowTooltip"
:sortable="item.sorTable"
:formatter="formatter"
header-align="center"
:sort-orders="['descending', 'ascending', null]"
:slotHeader="slotHeader"
:render-header="renderHeader"
:key="index"
>
<el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
:fixed="item.fixed" :show-overflow-tooltip="showOverflowTooltip" :sortable="item.sorTable"
:formatter="formatter" header-align="center" :sort-orders="['descending', 'ascending', null]"
:slotHeader="slotHeader" :render-header="renderHeader" :key="index">
<template slot-scope="scope">
<slot :name="item.value" :row="scope.row"></slot>
</template>
</el-table-column>
<!-- 默认数据 -->
<el-table-column
v-else
:prop="item.value"
:label="item.name"
:index="item.index"
:width="item.width"
:align="item.align"
:fixed="item.fixed"
:sortable="item.sorTable"
:column-key="index.toString()"
:show-overflow-tooltip="showOverflowTooltip"
header-align="center"
:sort-orders="['descending', 'ascending', null]"
:slotHeader="slotHeader"
:render-header="renderHeader"
:formatter="formatter"
:key="index"
>
<el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width"
:align="item.align" :fixed="item.fixed" :sortable="item.sorTable" :column-key="index.toString()"
:show-overflow-tooltip="showOverflowTooltip" header-align="center"
:sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
:formatter="formatter" :key="index">
</el-table-column>
</template>
<!-- 末端插槽 -->
<slot name="optionColumn"></slot>
</el-table>
<!-- 分页 -->
<el-pagination
:total="totalCount"
:page-size.sync="limitSize"
:current-page.sync="pageNum"
:page-sizes="pageSizes"
background
layout="prev, pager, next, jumper, ->, sizes, total"
class="tablePagination"
@size-change="sizeChange"
@next-click="nextClick"
@prev-click="prevClick"
@current-change="currentChange"
>
<el-pagination :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum" :page-sizes="pageSizes"
background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange"
@next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
</el-pagination>
<!-- 表头控制 -->
<div class="tableInfo" v-if="infoShow">
<ul class="tableList" v-show="show">
<el-checkbox-group v-model="checkDisabled">
<li
class="flexList"
v-for="(item, index) in newHeader"
:key="index"
:title="item.name"
>
<li class="flexList" v-for="(item, index) in newHeader" :key="index" :title="item.name">
<div>
<el-checkbox
:label="item.name"
@change="newHeader[index].disabled = !item.disabled"
>{{ item.name }}</el-checkbox
>
<el-checkbox :label="item.name" @change="newHeader[index].disabled = !item.disabled">{{ item.name }}
</el-checkbox>
</div>
</li>
</el-checkbox-group>
</ul>
<el-button
type="primary"
icon="el-icon-edit"
size="medium"
circle
@click="show = !show"
></el-button>
<el-button type="primary" icon="el-icon-edit" size="medium" circle @click="show = !show"></el-button>
</div>
</div>
</template>
......@@ -302,6 +229,7 @@ export default {
},
},
methods: {
//数据长度切换
sizeChange(val) {
this.$emit("sizeChange", val);
},
......@@ -526,13 +454,17 @@ export default {
margin-top: 40px;
text-align: right;
}
.w-table {
height: 100%;
　.el-table .darg_start {
.el-table .darg_start {
background-color: #f3f3f3;
}
.el-table th {
padding: 0;
.virtual {
position: absolute;
display: block;
......@@ -543,12 +475,14 @@ export default {
background: none;
border: none;
}
&.darg_active_left {
.virtual {
border-left: 2px dotted #666;
z-index: 99;
}
}
&.darg_active_right {
.virtual {
border-right: 2px dotted #666;
......@@ -556,6 +490,7 @@ export default {
}
}
}
.thead-cell {
padding: 0;
display: inline-flex;
......@@ -563,6 +498,7 @@ export default {
align-items: left;
cursor: pointer;
overflow: initial;
&:before {
content: "";
position: absolute;
......@@ -572,21 +508,25 @@ export default {
right: 0;
}
}
&.w-table_moving {
.el-table th .thead-cell {
cursor: move !important;
}
.el-table__fixed {
cursor: not-allowed;
}
}
}
.tableInfo {
position: fixed;
right: 30px;
bottom: 100px;
z-index: 99999999;
}
.tableList {
width: 200px;
max-height: 500px;
......@@ -600,20 +540,24 @@ export default {
background: #fff;
overflow-y: scroll;
}
.tableList::-webkit-scrollbar {
width: 4px;
height: 4px;
}
.tableList::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
background: rgba(0, 0, 0, 0.2);
}
.tableList::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
border-radius: 0;
background: rgba(0, 0, 0, 0.2);
}
.flexList {
width: 100%;
display: flex;
......
<template>
<div>
<el-dialog
title="货物配舱"
width="80%"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
:append-to-body="true"
>
<el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:append-to-body="true">
<el-divider content-position="left">已选货物信息</el-divider>
<el-table
:data="tableData"
size="mini"
height="200"
max-height="200"
border
stripe
highlight-current-row
style="width: 100%"
>
<el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
style="width: 100%">
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column
v-for="(item, index) in cargoHeader"
header-align="center"
align="center"
:prop="item.value"
:label="item.name"
:key="index"
:show-overflow-tooltip="true"
:formatter="formatter"
>
<el-table-column v-for="(item, index) in cargoHeader" header-align="center" align="center" :prop="item.value"
:label="item.name" :key="index" :show-overflow-tooltip="true" :formatter="formatter">
</el-table-column>
</el-table>
<el-form
ref="form"
label-position="right"
label-width="auto"
style="width: 400px; margin: 30px auto"
v-model="formData"
>
<el-form ref="form" label-position="right" label-width="auto" style="width: 400px; margin: 30px auto"
:model="formData" :rules="rules">
<el-form-item label="航班号" prop="fltNo">
<el-input
v-model="fltNo"
size="medium"
placeholder="请输入航班号"
maxlength="10"
style="width: 350px"
></el-input>
<el-input v-model="fltNo" size="medium" placeholder="请输入航班号" maxlength="10" style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="航班日期:" prop="fltDate">
<el-date-picker
v-model="formData.fltDate"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
size="medium"
style="width: 350px"
>
<el-date-picker v-model="formData.fltDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
size="medium" style="width: 350px">
</el-date-picker>
</el-form-item>
</el-form>
......@@ -118,11 +80,11 @@ export default {
{
required: true,
message: "航班日期不能为空",
trigger: "change",
trigger: "blur",
},
],
},
loading:false,
loading: false,
};
},
methods: {
......@@ -136,7 +98,7 @@ export default {
},
//确定配舱
submit() {
this.loading =true;
this.loading = true;
let arr = [];
this.tableData.forEach((item) => {
arr.push(item.id);
......@@ -196,7 +158,7 @@ export default {
type: "warning",
});
}
}).catch(()=>{
}).catch(() => {
this.loading = false;
});
} else {
......@@ -212,11 +174,11 @@ export default {
this.$refs['form'].clearValidate();
this.$emit("dialogBeforeClose", { close: false, reload: true });
},
formatter(row, column, cellValue, index){
if(column.property == "cargoRulesStatus"){
if(cellValue == 1){
formatter(row, column, cellValue, index) {
if (column.property == "cargoRulesStatus") {
if (cellValue == 1) {
return "手动"
}else{
} else {
return "自动"
}
}
......
<template>
<div>
<el-form
class="form-header"
:model="queryParams"
ref="queryForm"
label-position="right"
label-width="auto"
size="medium"
>
<el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto"
size="medium">
<el-row>
<el-col :span="6">
<el-form-item label="航班日期从" prop="fltDateStart">
<el-date-picker
class="formItem"
value-format="yyyy-MM-dd"
v-model="queryParams.fltDateStart"
type="date"
placeholder="选择日期"
>
<el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="到" prop="fltDateEnd">
<el-date-picker
class="formItem"
value-format="yyyy-MM-dd"
v-model="queryParams.fltDateEnd"
type="date"
placeholder="选择日期"
>
<el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班号" prop="fltNo">
<el-input
class="formItem"
v-model="queryParams.fltNo"
placeholder="请输入航班号"
clearable
/>
<el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班类型" prop="typeId">
<el-select
class="formItem"
v-model="queryParams.typeId"
placeholder="请选择航班类型"
clearable
>
<el-option
v-for="dict in selectOption.flightTypelist"
:key="dict.id"
:label="dict.chineseName"
:value="dict.id"
/>
<el-select class="formItem" v-model="queryParams.typeId" placeholder="请选择航班类型" clearable>
<el-option v-for="dict in selectOption.flightTypelist" :key="dict.id" :label="dict.chineseName"
:value="dict.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班状态" prop="statusId">
<el-select
class="formItem"
v-model="queryParams.statusId"
placeholder="请选择航班状态"
clearable
>
<el-option
v-for="dict in selectOption.flightStatuslist"
:key="dict.id"
:label="dict.chineseName"
:value="dict.id"
/>
<el-select class="formItem" v-model="queryParams.statusId" placeholder="请选择航班状态" clearable>
<el-option v-for="dict in selectOption.flightStatuslist" :key="dict.id" :label="dict.chineseName"
:value="dict.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班种类" prop="flightKindId">
<el-select
class="formItem"
v-model="queryParams.flightKindId"
placeholder="请选择航班种类"
clearable
>
<el-option
v-for="dict in selectOption.flightKindlist"
:key="dict.id"
:label="dict.chineseName"
:value="dict.id"
/>
<el-select class="formItem" v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable>
<el-option v-for="dict in selectOption.flightKindlist" :key="dict.id" :label="dict.chineseName"
:value="dict.id" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['base:flightInfo:add']"
>新增</el-button
>
<el-button
type="primary"
icon="el-icon-circle-check"
size="mini"
:disabled="ids.length == 0"
@click="handleFlightStatus('flightStatus10')"
v-hasPermi="['base:flightInfo:open']"
>自动配舱开启</el-button
>
<el-button
type="primary"
icon="el-icon-circle-close"
size="mini"
:disabled="ids.length == 0"
@click="handleFlightStatus('flightStatus80')"
v-hasPermi="['base:flightInfo:close']"
>自动配舱关闭</el-button
>
<el-button
type="primary"
icon="el-icon-circle-check"
size="mini"
:disabled="ids.length == 0"
@click="autoPushBatch('open')"
v-hasPermi="['base:flightInfo:autoPushOpen']"
>自动推送开启</el-button
>
<el-button
type="primary"
icon="el-icon-circle-close"
size="mini"
:disabled="ids.length == 0"
@click="autoPushBatch('close')"
v-hasPermi="['base:flightInfo:autoPushClose']"
>自动推送关闭</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="ids.length == 0"
@click="handleDelete"
v-hasPermi="['base:flightInfo:delete']"
>删除
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['base:flightInfo:add']">
新增</el-button>
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
@click="handleFlightStatus('flightStatus10')" v-hasPermi="['base:flightInfo:open']">自动配舱开启</el-button>
<el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
@click="handleFlightStatus('flightStatus80')" v-hasPermi="['base:flightInfo:close']">自动配舱关闭</el-button>
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
@click="autoPushBatch('open')" v-hasPermi="['base:flightInfo:autoPushOpen']">自动推送开启</el-button>
<el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
@click="autoPushBatch('close')" v-hasPermi="['base:flightInfo:autoPushClose']">自动推送关闭</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0" @click="handleDelete"
v-hasPermi="['base:flightInfo:delete']">删除
</el-button>
</el-form>
<Tables
ref="flightInfoTable"
ductName="FlightInformation"
:data="findAllFltDatList"
:headerData="tableHeader"
:infoData="tableHeader"
:selection="true"
:totalCount="total"
:loading="loading"
:limitSize="queryParams.limitSize"
:page="queryParams.pageNum"
:shiftKey="shiftKey"
:infoShow="false"
:height="tableHeight"
:pageSizes="[20, 30, 40, 50, 100]"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
@sortChange="sortChange"
@sizeChange="sizeChange"
>
<Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
:infoData="tableHeader" :selection="true" :totalCount="total" :loading="loading"
:limitSize="queryParams.limitSize" :page="queryParams.pageNum" :shiftKey="shiftKey" :infoShow="false"
:height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]" @tableSelect="tableSelect"
@tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange" @sizeChange="sizeChange">
<template slot="optionColumn">
<el-table-column
v-if="findAllFltDatList.length > 0"
label="操作"
align="center"
class-name="small-padding fixed-width"
fixed="right"
>
<el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:flightInfo:update']"
>修改</el-button
>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['base:flightInfo:update']">修改</el-button>
</template>
</el-table-column>
</template>
</Tables>
<!-- 添加或修改对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="60%"
:close-on-click-modal="false"
:append-to-body="true"
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-position="right"
label-width="auto"
>
<el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
<el-row>
<el-col :span="12">
<el-form-item label="航班号" prop="fltNo">
<el-input
@blur="blurfltNo"
:disabled="formdisabled.fltNo"
style="width: 93%"
v-model="form.fltNo"
placeholder="请输入航班号"
maxlength="10"
/>
<el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" style="width: 93%" v-model="form.fltNo"
placeholder="请输入航班号" maxlength="10" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班日期" prop="fltDate">
<el-date-picker
:disabled="formdisabled.fltDate"
clearable
size="small"
v-model="form.fltDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择航班日期"
>
<el-date-picker :disabled="formdisabled.fltDate" clearable size="small" v-model="form.fltDate" type="date"
value-format="yyyy-MM-dd" placeholder="选择航班日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="cutOff时间" prop="cutOffTime">
<el-select
v-model="form.cutOffTime"
clearable
placeholder="选择时间"
type="string"
>
<el-option
v-for="item in selectOption.cutOffTime"
:key="item"
:label="item"
:value="item"
>
<el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string">
<el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班路线" prop="route">
<el-input
style="width: 93%"
v-model="form.route"
placeholder="请输入航班路线"
/>
<el-input style="width: 93%" v-model="form.route" placeholder="请输入航班路线" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班种类" prop="kindId">
<el-select v-model="form.kindId" placeholder="请选择航班种类">
<el-option
v-for="item in selectOption.flightKindlist"
:key="item.id"
:label="item.chineseName"
:value="item.id"
>
<el-option v-for="item in selectOption.flightKindlist" :key="item.id" :label="item.chineseName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
......@@ -286,151 +120,87 @@
<el-col :span="12">
<el-form-item label="航班类型" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择航班类型">
<el-option
v-for="item in selectOption.flightTypelist"
:key="item.id"
:label="item.chineseName"
:value="item.id"
>
<el-option v-for="item in selectOption.flightTypelist" :key="item.id" :label="item.chineseName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班状态" prop="statusId">
<el-select
:disabled="true"
v-model="form.statusId"
placeholder="请选择航班状态"
>
<el-option
v-for="item in selectOption.flightStatuslist"
:key="item.id"
:label="item.chineseName"
:value="item.id"
>
<el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
<el-option v-for="item in selectOption.flightStatuslist" :key="item.id" :label="item.chineseName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="原始重量（KG）" prop="originalWeight">
<el-input-number
@change="LowHighAvailable"
placeholder="请输入原始重量（KG）"
style="width: 93%"
v-model="form.originalWeight"
></el-input-number>
<el-input-number @change="LowHighAvailable" placeholder="请输入原始重量（KG）" style="width: 93%"
v-model="form.originalWeight"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="额外增重百分比" prop="extraWeightPercent">
<el-input-number
@change="LowHighAvailable"
placeholder="请输入额外增重百分比"
style="width: 93%"
v-model="form.extraWeightPercent"
></el-input-number>
<el-input-number @change="LowHighAvailable" placeholder="请输入额外增重百分比" style="width: 93%"
v-model="form.extraWeightPercent"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否开启高低价" prop="highLowPriceFlg">
<el-switch
@change="LowHighAvailable"
v-model="form.highLowPriceFlg"
:active-value="1"
:inactive-value="0"
active-color="#13ce66"
>
<el-switch @change="LowHighAvailable" v-model="form.highLowPriceFlg" :active-value="1" :inactive-value="0"
active-color="#13ce66">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否预审" prop="isNeedRequired">
<el-switch
:disabled="true"
v-model="form.isNeedRequired"
:active-value="1"
:inactive-value="0"
active-color="#13ce66"
>
<el-switch :disabled="true" v-model="form.isNeedRequired" :active-value="1" :inactive-value="0"
active-color="#13ce66">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高价百分比" prop="highPriceWeightPercent">
<el-input-number
:disabled="ishighPriceWeightPercent"
@change="LowHighAvailable"
placeholder="请输入高价百分比"
style="width: 93%"
v-model="form.highPriceWeightPercent"
></el-input-number>
<el-input-number :disabled="ishighPriceWeightPercent" @change="LowHighAvailable" placeholder="请输入高价百分比"
style="width: 93%" v-model="form.highPriceWeightPercent"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低价百分比" prop="lowPriceWeightPercent">
<el-input-number
:disabled="true"
placeholder="请输入低价百分比"
style="width: 93%"
v-model="form.lowPriceWeightPercent"
></el-input-number>
<el-input-number :disabled="true" placeholder="请输入低价百分比" style="width: 93%"
v-model="form.lowPriceWeightPercent"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高价可配重量" prop="highAvailableWeight">
<el-input-number
:disabled="true"
placeholder="请输入高价可配重量"
style="width: 93%"
v-model="form.highAvailableWeight"
:precision="2"
></el-input-number>
<el-input-number :disabled="true" placeholder="请输入高价可配重量" style="width: 93%"
v-model="form.highAvailableWeight" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低价可配重量" prop="lowAvailableWeight">
<el-input-number
:disabled="true"
placeholder="请输入低价可配重量"
style="width: 93%"
v-model="form.lowAvailableWeight"
:precision="2"
></el-input-number>
<el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width: 93%"
v-model="form.lowAvailableWeight" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高价已配重量" prop="highAllocatedWeight">
<el-input-number
:disabled="true"
placeholder="请输入高价已配重量"
style="width: 93%"
v-model="form.highAllocatedWeight"
:precision="2"
></el-input-number>
<el-input-number :disabled="true" placeholder="请输入高价已配重量" style="width: 93%"
v-model="form.highAllocatedWeight" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低价已配重量" prop="lowAllocatedWeight">
<el-input-number
:disabled="true"
placeholder="请输入低价已配重量"
style="width: 93%"
v-model="form.lowAllocatedWeight"
:precision="2"
></el-input-number>
<el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width: 93%"
v-model="form.lowAllocatedWeight" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已配总重量" prop="alloctedWeight">
<el-input-number
:disabled="true"
placeholder="请输入已配总重量"
style="width: 93%"
v-model="form.alloctedWeight"
:precision="2"
></el-input-number>
<el-input-number :disabled="true" placeholder="请输入已配总重量" style="width: 93%" v-model="form.alloctedWeight"
:precision="2"></el-input-number>
</el-form-item>
</el-col>
</el-row>
......@@ -440,21 +210,12 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog
title="未删除成功航班"
width="40%"
center
:visible.sync="dialogTableVisible"
:close-on-click-modal="false"
:append-to-body="true"
>
<el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false"
:append-to-body="true">
<el-table :data="gridData">
<el-table-column property="fltNo" label="航班号"></el-table-column>
<el-table-column property="fltDate" label="航班日期"></el-table-column>
<el-table-column
property="alloctedWeight"
label="已配重量"
></el-table-column>
<el-table-column property="alloctedWeight" label="已配重量"></el-table-column>
</el-table>
</el-dialog>
</div>
......@@ -841,7 +602,7 @@ export default {
created() {
//查询条件数据源
let date = new Date()
this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth()+1).length>1?(date.getMonth()+1):'0'+(date.getMonth()+1)}-${date.getDate()}`
this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth() + 1).length > 1 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${date.getDate()}`
this.findFltConditionData();
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.findAllFltData();
......@@ -1027,7 +788,7 @@ export default {
this.form,
"highAvailableWeight",
(Weight - this.form.alloctedWeight) *
(this.form.highPriceWeightPercent / 100)
(this.form.highPriceWeightPercent / 100)
);
this.$set(
this.form,
......@@ -1050,7 +811,7 @@ export default {
this.form,
"highAvailableWeight",
(Weight - this.form.alloctedWeight) *
(this.form.highPriceWeightPercent / 100)
(this.form.highPriceWeightPercent / 100)
);
}
} else {
......@@ -1094,7 +855,7 @@ export default {
Weightall() {
let Weight = 0;
if (this.form.extraWeightPercent > 0) {
Weight =this.form.originalWeight * (this.form.extraWeightPercent / 100)+this.form.originalWeight;
Weight = this.form.originalWeight * (this.form.extraWeightPercent / 100) + this.form.originalWeight;
} else {
Weight = this.form.originalWeight;
}
......@@ -1126,7 +887,11 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const fIds = this.ids;
let fIds = [];
this.ids.forEach(item => {
fIds.push(item.id)
})
console.log(fIds)
this.$confirm("是否确认删除所选数据?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1148,12 +913,12 @@ export default {
.then(() => {
this.dialogTableVisible = true;
})
.catch(() => {});
.catch(() => { });
} else {
this.msgSuccess(response.msg);
}
})
.catch(() => {});
.catch(() => { });
},
/** 提交按钮 */
submitForm: function () {
......@@ -1228,19 +993,19 @@ export default {
let data = {
updateIds: [],
};
this.ids.map(item=>{
data.status = status;
if(status === 'flightStatus80'){
if(item.statusName === '已开启'){
this.ids.map(item => {
data.status = status;
if (status === 'flightStatus80') {
if (item.statusName === '已开启') {
data.updateIds.push(item.id)
}
}else{
if(item.statusName === '已关闭'){
} else {
if (item.statusName === '已关闭') {
data.updateIds.push(item.id)
}
}
})
if(data.updateIds.length > 0){
if (data.updateIds.length > 0) {
updateStatusBatch(data).then((response) => {
if (response.code === 200) {
this.msgSuccess(handle + "成功");
......@@ -1270,20 +1035,20 @@ export default {
}
}
});
if(data.updateIds.length > 0){
if (data.updateIds.length > 0) {
updateAutoPushBatch(data)
.then((res) => {
if (res.code === 200) {
this.msgSuccess(`自动推送${msg}成功`);
this.findAllFltData();
} else {
this.msgError(res.msg);
}
})
.catch(err => {
this.msgError(err);
});
}else{
.then((res) => {
if (res.code === 200) {
this.msgSuccess(`自动推送${msg}成功`);
this.findAllFltData();
} else {
this.msgError(res.msg);
}
})
.catch(err => {
this.msgError(err);
});
} else {
this.msgSuccess(`自动推送${msg}成功`);
this.findAllFltData();
}
......@@ -1316,12 +1081,12 @@ export default {
<style>
.el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
.el-table__body tr.current-row > td {
.el-table__body tr.current-row>td {
background-color: #a0cfff;
}
.el-table--striped .el-table__body tr.hover-row.el-table__row--striped > td,
.el-table__body tr.hover-row > td {
.el-table--striped .el-table__body tr.hover-row.el-table__row--striped>td,
.el-table__body tr.hover-row>td {
background-color: #d9ecff !important;
}
</style>
......
<template>
<div class="cargoPage">
<el-form
ref="cargoForm"
class="form-header"
label-position="right"
label-width="auto"
size="small"
:model="formData"
>
<el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small"
:model="formData">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-form-item label="配舱航班日期">
<el-date-picker
class="formItem"
v-model="cargoPlaneTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
<el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号">
<el-input
type="textarea"
v-model="cargoPlaneNo"
class="formItem"
placeholder="AC001;AC002"
:autosize="true"
clearable
></el-input>
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="海关回执状态">
<el-select
placeholder="不限"
v-model="formData.customsReceiptStatusId"
class="formItem"
multiple
clearable
>
<el-option
v-for="item in findConditionData.cargoCustomsReturnStatus"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
<el-option v-for="item in findConditionData.cargoCustomsReturnStatus" :label="item.chineseName"
:value="item.id" :key="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input
type="textarea"
v-model="formData.waybillNo"
class="formItem"
placeholder="请输入运单号（回车间隔）"
:autosize="true"
clearable
></el-input>
<el-input type="textarea" v-model="formData.waybillNo" class="formItem" placeholder="请输入运单号（回车间隔）"
:autosize="true" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申报类别">
<el-select
placeholder="不限"
v-model="formData.typeId"
class="formItem"
clearable
>
<el-option
v-for="item in findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
<el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
:key="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col>
<el-col :span="6">
<el-form-item label="服务类型">
<el-select
placeholder="不限"
v-model="formData.serviceTypeId"
class="formItem"
filterable
clearable
>
<el-option
v-for="item in findConditionData.cargoServiceType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" filterable clearable>
<el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
:key="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA">
<el-input
type="textarea"
v-model="ursa"
class="formItem"
placeholder="S_;P_;E2"
:autosize="true"
clearable
></el-input>
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :autosize="true" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="站点">
<el-input
type="textarea"
v-model="siteName"
class="formItem"
placeholder="PVG;PEK"
:autosize="true"
clearable
></el-input>
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :autosize="true"
clearable></el-input>
</el-form-item>
</el-col>
<el-col v-show="formShow">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-form-item label="ACCS原航班日期">
<el-date-picker
class="formItem"
v-model="flightTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
<el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCS原航班号">
<el-input
type="text"
v-model="fltNo"
class="formItem"
placeholder="请输入ACCS航班号"
clearable
></el-input>
<el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker
class="formItem"
v-model="formData.pickUpDate"
type="date"
placeholder="选择日期"
:value-format="valueFormat"
clearable
>
<el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
:value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建日期">
<el-date-picker
class="formItem"
v-model="createDate"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
<el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCSpool">
<el-select
placeholder="不限"
v-model="formData.accsPool"
class="formItem"
clearable
>
<el-option
value="Pre-MDE"
key="Pre-MDE"
>
</el-option>
<el-option
value="OSPR"
key="OSPR"
>
</el-option>
<el-option
value="Manifest"
key="Manifest"
>
</el-option>
</el-select>
<el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
<el-option value="Pre-MDE" key="Pre-MDE">
</el-option>
<el-option value="OSPR" key="OSPR">
</el-option>
<el-option value="Manifest" key="Manifest">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货物状态">
<el-select
placeholder="不限"
v-model="formData.statusId"
class="formItem"
filterable
clearable
>
<el-option
v-for="item in findConditionData.cargoStatus"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
<el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
:key="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否自动">
<el-select
placeholder="不限"
v-model="formData.allocationTypeId"
class="formItem"
clearable
>
<el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
<el-option label="手动" value="1"> </el-option>
<el-option label="自动" value="2"> </el-option>
</el-select>
......@@ -246,114 +122,42 @@
</el-col>
</el-row>
<div style="paddingLeft: 10px; marginTop: 20px">
<el-button
type="primary"
icon="el-icon-search"
size="small"
:loading="tableLoading"
@click="select(0)"
>查询</el-button
>
<el-button
v-hasPermi="['base:cargo:export']"
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small"
@click="xlse(0)"
:disabled="tableData.length == 0"
:loading="downLoadingTip.downloading"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button
>
<el-button
v-hasPermi="['base:cargo:export']"
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small"
@click="xlse(1)"
:disabled="tableData.length == 0"
:loading="downLoadingTip.downloading"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button
>
<el-button
type="primary"
size="small"
:disabled="selectTable.length==0"
v-hasPermi="['base:cargo:export']"
@click="release"
>释放舱位</el-button
>
<span style="marginLeft: 20px; color: #ffba00"
>全部导出上限80000条数据</span
>
<el-progress
v-if="progress != 0"
class="progress"
:stroke-width="12"
:show-text="true"
:percentage="progress"
:status="progress == 100 ? 'success' : 'warning'"
></el-progress>
<el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
</el-button>
<el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button>
<el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button>
<el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:export']"
@click="release">释放舱位</el-button>
<span style="marginLeft: 20px; color: #ffba00">全部导出上限80000条数据</span>
<el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
:status="progress == 100 ? 'success' : 'warning'"></el-progress>
<div class="tips">
<span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
<span>总件数:{{ allQty }}</span>
</div>
<div class="formShow" @click="formShow = !formShow">
<i class="el-icon-s-tools"></i
>{{ formShow ? "收起条件" : "更多条件" }}
<i class="el-icon-s-tools"></i>{{ formShow ? "收起条件" : "更多条件" }}
</div>
</div>
</el-form>
<Tables
ref="newTables"
ductName="cargo"
:data="tableData"
:headerData="tableHeader"
:infoData="tableHeader"
:selection="true"
:totalCount="totalCount"
:loading="tableLoading"
:limitSize="limitSize"
:limitStart="limitStart"
:page="page"
:shiftKey="shiftKey"
:infoShow="false"
:pageSizes="[100]"
:height="tableHeight"
@sizeChange="sizeChange"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
@sortChange="sortChange"
></Tables>
<el-dialog
title="舱位释放结果"
width="80%"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
:show-close="false"
:append-to-body="true"
>
<el-table
:data="selectTable"
size="mini"
border
stripe
highlight-current-row
style="width: 100%"
>
<Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :infoData="tableHeader"
:selection="true" :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart"
:page="page" :shiftKey="shiftKey" :infoShow="false" :pageSizes="[100]" :height="tableHeight"
@sizeChange="sizeChange" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
@currentChange="currentChange" @sortChange="sortChange"></Tables>
<el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true">
<el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column
v-for="(item, index) in releaseHeader"
header-align="center"
align="center"
:prop="item.value"
:label="item.name"
:key="index"
:show-overflow-tooltip="true"
>
<el-table-column v-for="(item, index) in releaseHeader" header-align="center" align="center" :prop="item.value"
:label="item.name" :key="index" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
<div slot="footer">
......@@ -364,7 +168,7 @@
</template>
<script>
import { findConditionData, findCargoData , releaseCargo } from "@/api/cargoSelect";
import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
......@@ -408,7 +212,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true,
disabled: true,
},
{
name: "取件日期",
......@@ -417,7 +221,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "取件扫描号",
......@@ -426,7 +230,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "站点",
......@@ -435,7 +239,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "运单号",
......@@ -444,7 +248,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "总单号",
......@@ -453,7 +257,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "服务类型",
......@@ -462,7 +266,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "服务代码",
......@@ -471,7 +275,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "URSA",
......@@ -480,7 +284,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "推送状态",
......@@ -489,7 +293,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "释放状态",
......@@ -498,7 +302,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "申报类型",
......@@ -507,7 +311,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "HandlingCode",
......@@ -516,7 +320,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "subcategory",
......@@ -525,7 +329,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "件数",
......@@ -534,7 +338,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "实际重量",
......@@ -543,7 +347,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "收件人国家代码",
......@@ -552,7 +356,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "品名描述",
......@@ -561,7 +365,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "海关回执状态",
......@@ -570,7 +374,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "预审状态",
......@@ -579,7 +383,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "航班预审意见",
......@@ -588,7 +392,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "AccsPool",
......@@ -597,7 +401,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "货物状态",
......@@ -606,7 +410,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "终配航班号",
......@@ -615,7 +419,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "终配航班日期",
......@@ -624,7 +428,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "二配航班号",
......@@ -633,7 +437,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "二配航班日期",
......@@ -642,7 +446,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "预配航班号",
......@@ -651,7 +455,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "预配航班日期",
......@@ -660,7 +464,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "ACCS原航班号",
......@@ -669,7 +473,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "ACCS原航班日期",
......@@ -678,7 +482,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "ACCS原航线",
......@@ -687,7 +491,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "是否RDE手工录入",
......@@ -696,7 +500,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "是否自动",
......@@ -705,7 +509,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "发件人账号",
......@@ -714,7 +518,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "发件公司中文名称",
......@@ -723,7 +527,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "始发地城市名称",
......@@ -732,7 +536,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "收件地",
......@@ -741,7 +545,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "尺寸",
......@@ -750,7 +554,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "大货预审意见（是否可以配置航班）",
......@@ -759,7 +563,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "大货预审时间",
......@@ -768,7 +572,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "海关回执时间",
......@@ -777,7 +581,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "航班预审时间",
......@@ -786,7 +590,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "创建人",
......@@ -795,7 +599,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "创建时间",
......@@ -804,10 +608,10 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
], //表头数据
releaseHeader:[
releaseHeader: [
{
type: "",
name: "提示信息",
......@@ -816,7 +620,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
type: "",
......@@ -826,7 +630,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
type: "",
......@@ -836,7 +640,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
type: "",
......@@ -846,7 +650,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
type: "",
......@@ -856,7 +660,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
type: "",
......@@ -866,7 +670,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
type: "",
......@@ -876,11 +680,11 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
}
],
findConditionData: {}, //货物查询条件
tableData:[], //表格数据
tableData: [], //表格数据
allWeight: 0,
allQty: 0,
shiftKey: false,
......@@ -900,8 +704,8 @@ export default {
limitSize: 100, //无限制-1
page: 1,
progress: 0,
tableHeight:null,
dialogVisible:false,
tableHeight: null,
dialogVisible: false,
formShow: true, //菜单隐藏
};
},
......@@ -920,16 +724,16 @@ export default {
},
activated() {
if(this.$store.state.tagsView.cachedViews.length > 0 ){
this.$store.state.tagsView.cachedViews.forEach(item=>{
if(item === 'QueryCargo'){
this.totalCount>0?this.select():''
if (this.$store.state.tagsView.cachedViews.length > 0) {
this.$store.state.tagsView.cachedViews.forEach(item => {
if (item === 'QueryCargo') {
this.totalCount > 0 ? this.select() : ''
}
})
}
},
deactivated(){
deactivated() {
this.tableData = []
},
......@@ -944,11 +748,11 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
},
watch:{
formShow(val,oldVal){
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-120
watch: {
formShow(val, oldVal) {
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
}
},
methods: {
......@@ -997,46 +801,46 @@ export default {
this.cargoTotal();
},
//释放仓位
release(){
release() {
let idList = []
this.selectTable.map(item => {
item.msg = ''
idList.push(item.id)
})
releaseCargo(idList).then(res=>{
if(res.code === 200){
releaseCargo(idList).then(res => {
if (res.code === 200) {
this.$message({
message: res.msg,
type: "success",
});
}else if(res.code === 201){
} else if (res.code === 201) {
this.selectTable.map(item => {
res.data['success'].map(val=>{
val === item.id ? item.msg = item.msg+'操作成功,正在释放中。' : ''
res.data['success'].map(val => {
val === item.id ? item.msg = item.msg + '操作成功,正在释放中。' : ''
})
res.data['accsPoolFlase'].map(val=>{
val === item.id ? item.msg = item.msg+'accs pool状态不正确。' : ''
res.data['accsPoolFlase'].map(val => {
val === item.id ? item.msg = item.msg + 'accs pool状态不正确。' : ''
})
res.data['existReleasing'].map(val=>{
val === item.id ? item.msg = item.msg+'已经在释放，请勿重复释放。' : ''
res.data['existReleasing'].map(val => {
val === item.id ? item.msg = item.msg + '已经在释放，请勿重复释放。' : ''
})
res.data['noFlight'].map(val=>{
val === item.id ? item.msg = item.msg+'无配载航班。' : ''
res.data['noFlight'].map(val => {
val === item.id ? item.msg = item.msg + '无配载航班。' : ''
})
})
this.dialogVisible = true
}else{
} else {
this.$message({
message: res.msg,
type: "warning",
});
}
}).catch(err=>{
}).catch(err => {
console.log(err)
})
},
//关闭弹窗
close(){
close() {
this.dialogVisible = false
this.selectTable = []
this.select()
......@@ -1134,7 +938,7 @@ export default {
item.index = index;
});
},
sizeChange(val){
sizeChange(val) {
this.limitSize = val
this.select(0);
},
......@@ -1184,7 +988,7 @@ export default {
}
}
},
formatter(){}
formatter() { }
},
computed: {
fltNo: {
......@@ -1231,11 +1035,13 @@ export default {
margin-top: 10px;
margin-left: 50px;
}
.progress {
width: 200px;
display: inline-block;
margin: 0 0 0 20px;
}
.formShow {
width: max-content;
height: 48px;
......