Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
f90f4ddd 2 parents d551b56e 0e6ac379

Merge branch 'test' into uat

Expand all
Inline Side-by-side
Showing 28 changed files with 246 additions and 200 deletions
......@@ -12,7 +12,6 @@
}
}
}
.blue-btn {
@include colorBtn($blue)
}
......
@import './variables.scss';
@import './mixin.scss';
@import './transition.scss';
@import './element-ui.scss';
@import './sidebar.scss';
@import './btn.scss';
@import "./variables.scss";
@import "./mixin.scss";
@import "./transition.scss";
@import "./element-ui.scss";
@import "./sidebar.scss";
@import "./btn.scss";
body {
height: 100%;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
}
label {
......@@ -108,7 +109,8 @@ aside {
display: block;
line-height: 32px;
font-size: 16px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
color: #2c3e50;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......@@ -138,7 +140,7 @@ aside {
}
.text-center {
text-align: center
text-align: center;
}
.sub-navbar {
......@@ -149,7 +151,13 @@ aside {
text-align: right;
padding-right: 20px;
transition: 600ms ease position;
background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
background: linear-gradient(
90deg,
rgba(32, 182, 249, 1) 0%,
rgba(32, 182, 249, 1) 0%,
rgba(33, 120, 241, 1) 100%,
rgba(33, 120, 241, 1) 100%
);
.subtitle {
font-size: 20px;
......@@ -216,7 +224,7 @@ body {
}
&::-webkit-scrollbar-track-piece {
background: #F2F6FC;
background: #f2f6fc;
}
}
......@@ -239,7 +247,7 @@ body {
.el-table__fixed,
.el-table__fixed-right {
height: calc(100% - 7px) !important;
box-shadow: -5px -2px 10px rgba(0, 0, 0, .12) !important;
box-shadow: -5px -2px 10px rgba(0, 0, 0, 0.12) !important;
.el-table__fixed-body-wrapper {
height: calc(100% - 36px) !important;
......@@ -247,7 +255,7 @@ body {
}
// 当表格没有滚动条时
.el-table__body-wrapper.is-scrolling-none~.el-table__fixed-right {
.el-table__body-wrapper.is-scrolling-none ~ .el-table__fixed-right {
height: 100% !important;
bottom: 0 !important;
box-shadow: none !important;
......@@ -307,4 +315,7 @@ body {
.el-select-dropdown__wrap {
max-height: 350px !important;
}
\ No newline at end of file
}
.btn-mb-4 {
margin-bottom: 4px;
}
......
......@@ -111,6 +111,7 @@
<el-date-picker
v-if="item.type === 'Date'"
v-model.trim="tempQueryForm[item.prop]"
:style="{ width: item.width }"
:disabled="item.disable"
:placeholder="item.placeholder ? item.placeholder : '请选择日期'"
clearable
......@@ -121,6 +122,7 @@
<el-time-select
v-if="item.type === 'Time'"
v-model.trim="tempQueryForm[item.prop]"
:style="{ width: item.width }"
:disabled="item.disable"
:placeholder="item.placeholder ? item.placeholder : '请选择时间'"
clearable
......@@ -143,6 +145,7 @@
v-if="item.type === 'datetimerange'"
type="datetimerange"
v-model.trim="tempQueryForm[item.prop]"
:style="{ width: item.width }"
:disabled="item.disable"
range-separator="至"
start-placeholder="开始日期"
......@@ -289,7 +292,7 @@ export default {
// 用于控制该表单内组件的尺寸 medium / small / mini
size: {
type: String,
default: "medium",
default: "small",
},
},
data() {
......
......@@ -242,5 +242,12 @@ export default {
};
</script>
<style lang="scss">
.el-table {
th {
padding: 0;
}
td{
padding: 0;
}
}
</style>
......
......@@ -54,26 +54,26 @@ const permission = {
return new Promise((resolve) => {
// 向后端请求路由数据
getRouters().then((res) => {
// const newUrl = {
// id: 24,
// name: "et86",
// path: "/et86",
// hidden: false,
// component: "allocationConfig/et86",
// meta: {
// title: "ET86",
// icon: "edit",
// permissions: "allocation:rand:list",
// noCache: false,
// },
// alwaysShow: false,
// children: null,
// };
// res.data.map((item) => {
// if (item.name == "AllocationConfig") {
// item.children.push(newUrl);
// }
// });
const newUrl = {
id: 24,
name: "et86",
path: "/et86",
hidden: false,
component: "allocationConfig/et86",
meta: {
title: "ET86",
icon: "edit",
permissions: "allocation:rand:list",
noCache: false,
},
alwaysShow: false,
children: null,
};
res.data.map((item) => {
if (item.name == "AllocationConfig") {
item.children.push(newUrl);
}
});
res.data = hasPermi.routerPer(res.data);
const sdata = JSON.parse(JSON.stringify(res.data));
const rdata = JSON.parse(JSON.stringify(res.data));
......
......@@ -3,20 +3,20 @@
<el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small"
@submit.native.prevent>
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCS原航班日期">
<el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCS原航班号">
<el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="海关回执状态">
<el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
<el-option v-for="item in selectData.findConditionData
......@@ -26,7 +26,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="货物状态">
<el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
<el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
......@@ -35,7 +35,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCSpool">
<el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
<el-option value="Pre-MDE" key="Pre-MDE">
......@@ -47,7 +47,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="申报类别">
<el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
<el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
......@@ -56,7 +56,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="服务类型">
<el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
<el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
......@@ -66,7 +66,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="重量区间">
<el-row>
<el-col :span="10">
......@@ -82,7 +82,7 @@
</el-row>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="件数区间">
<el-row>
<el-col :span="10">
......@@ -98,26 +98,26 @@
</el-row>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="取件日期">
<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-col :span="8">
<el-form-item label="URSA">
<el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="始发站">
<el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item>
<template slot="label">
<div style="display:inline-block">ACCS航线
......@@ -134,9 +134,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="运单号">
<el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号（回车分割）" :maxlength="12000"
<el-input class="formItem" type="textarea" :rows="1" placeholder="例: xxx;xxx;" :maxlength="12000"
v-model="formData.waybillNo" clearable></el-input>
</el-form-item>
</el-col>
......@@ -205,7 +205,7 @@
</template>
<script>
import Dialog from "./info.vue";
import Dialog from "./info";
import { findConditionData, findCargoAllocationData, getAccsRoute } from "@/api/cargoSelect";
import { allDictData } from "@/api/destinationFlight";
import { downLoadXlsx } from "@/utils/zipdownload";
......
......@@ -4,6 +4,7 @@ export const formConfig = [
type: "Date",
name: "startTime",
prop: "startTime",
width: "140px",
placeholder: "请选择开始时间",
rules: { required: true, message: "请选择开始时间", trigger: "blur" },
},
......@@ -12,6 +13,7 @@ export const formConfig = [
type: "Date",
name: "endTime",
prop: "endTime",
width: "140px",
placeholder: "请选择结束时间",
rules: { required: true, message: "请选择结束时间", trigger: "blur" },
},
......
......@@ -44,8 +44,9 @@ export default {
data() {
return {
formConfig: formConfig, // 表单配置项
queryForm: { // 表单参数
status: "有效"
queryForm: {
// 表单参数
status: "有效",
},
pageConfig: {
// 分页配置项
......@@ -115,10 +116,15 @@ export default {
},
// 搜索
searchBtn(row) {
let params = {
...this.queryForm,
};
if (this.queryForm.status == "有效") {
params.status = '1';
}
this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
console.log(val);
console.log(params);
});
console.log(this.queryForm);
},
// 重置表单
restForm() {
......@@ -154,7 +160,7 @@ export default {
})
.then(() => {
console.log("删除：", item);
this.msgSuccess("删除成功!")
this.msgSuccess("删除成功!");
})
.catch(() => {});
},
......
<template>
<div>
<el-form ref="flightAllocForm" :model="queryParams" class="form-header" size="medium" label-position="right"
<el-form ref="flightAllocForm" :model="queryParams" class="form-header" size="small" label-position="right"
label-width="auto" @submit.native.prevent>
<el-row>
<el-col :span="6">
......@@ -16,7 +16,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="3">
<el-col :span="4">
<el-form-item label="状态">
<el-select class="formItem" v-model="queryParams.status" placeholder="状态">
<el-option label="有效" value="1"></el-option>
......@@ -26,11 +26,6 @@
</el-col>
</el-row>
<div>
<el-form-item label="日期查询">
<el-switch v-model="queryParams.querySpecifyData" active-value="1" inactive-value="2" active-color="#13ce66"
inactive-color="#909399" @change="switchChange">
</el-switch>
</el-form-item>
<el-button type="primary" icon="el-icon-search" :loading="loading" @click="getList" size="mini">查询</el-button>
<el-button class="mb20" type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:alloc:add']"
@click="
......@@ -39,6 +34,8 @@
params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' },
})
">添加</el-button>
<el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1" inactive-value="2" active-color="#13ce66"
inactive-color="#909399" @change="switchChange"></el-switch>
</div>
</el-form>
<Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true"
......
......@@ -22,7 +22,7 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
</el-button>&#12288;
<span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span>
<span style="color:#ff4949; font-size: 12px;">注：原航班+日期查询该日期的航班实际情况</span>
</el-form-item>
<br />
<el-form-item>
......@@ -111,8 +111,8 @@
</el-form-item>
</el-col>
<el-col :span="24" style="margin-bottom: 5%">
<span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
<span style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航班后加减【+-】天数。如:CA1053+1;CZ433-1</span>
<span style="color: #ff4949; margin-left: 10%; font-size: 12px;">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
<span style="color: #ff4949; margin-left: 10%; font-size: 12px;">提示:如果需要设置配载航班延迟或提前可以直接在目的航班后加减【+-】天数。如:CA1053+1;CZ433-1</span>
</el-col>
<el-col :span="24">
<el-form-item label="配载航班" prop="flightRank">
......
<template>
<div style="margin:30px 20px 20px">
<div style="margin: 0 20px 0 20px">
<el-form class="form-header" :model="pageOption" ref="queryForm" label-position="right" label-width="auto"
size="small">
<el-row>
......@@ -21,17 +21,17 @@
</el-row>
</el-form>
<div class="mb20" ref="preReviewOptions" style="font-size: 12px; font-weight: 700">
<el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="preQuery(1)">搜 索
<el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="preQuery(1)">搜 索
</el-button>
<el-button type="primary" icon="el-icon-plus" size="small" @click="dialogVisible = true"
<el-button type="primary" icon="el-icon-plus" size="mini" @click="dialogVisible = true"
v-hasPermi="['allocation:preReview:add']">新增预审航班</el-button>
<el-button type="primary" size="small" icon="el-icon-check" :disabled="selectData.length == 0"
<el-button type="primary" size="mini" icon="el-icon-check" :disabled="selectData.length == 0"
@click="preOption(1)" v-hasPermi="['allocation:preReview:open']">
预审开启</el-button>
<el-button type="primary" size="small" icon="el-icon-close" :disabled="selectData.length == 0"
<el-button type="primary" size="mini" icon="el-icon-close" :disabled="selectData.length == 0"
@click="preOption(0)" v-hasPermi="['allocation:preReview:close']">
预审关闭</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" :disabled="selectData.length == 0"
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="selectData.length == 0"
@click="preOption(2)" v-hasPermi="['allocation:preReview:delete']">删 除
</el-button>
</div>
......
......@@ -39,21 +39,21 @@
<el-col :span="6">
<el-form-item label="运单号">
<el-input clearable type="textarea" v-model="queryParams.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="4"></el-input>
placeholder="例: xxx;xxx;" :rows="1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-switch v-model="queryParams.reExport" active-color="#13ce66" active-text="重新导出" style="padding-left: 35px">
</el-switch>
<div style="margin-top:25px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="warning" :disabled="tableData.length == 0" v-hasPermi="['base:caExport:export']"
@click="xlse()" :loading="downLoadingTip.downloading" icon="el-icon-download" size="mini">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出"
}}</el-button>
<el-switch v-model="queryParams.reExport" active-color="#13ce66" inactive-text="重新导出" style="margin-left: 15px">
</el-switch>
</div>
</el-form>
<el-table max-height="300" highlight-current-row border stripe v-loading="loading" :data="tableData">
<el-table height="300" highlight-current-row border stripe v-loading="loading" :data="tableData">
<el-table-column label="运单号" align="center" prop="waybillNo" />
<el-table-column label="申报类别" align="center" prop="typeName" />
<el-table-column label="件数" align="center" prop="qty" width="70" />
......
......@@ -35,8 +35,11 @@
</template>
</el-table-column>
<el-table-column v-if="tableData.length == 0"></el-table-column>
<el-table-column v-for="(value, key) in this.tableData[0]" :key="key"
<template v-for="(value, key) in this.tableData[0]">
<el-table-column
:key="key"
v-if="key != 'errorMessage' && key != 'line'" :label="key" :prop="key"></el-table-column>
</template>
</el-table>
</div>
</template>
......@@ -160,4 +163,4 @@ export default {
margin-left: 10px;
vertical-align: top;
}
</style>
\ No newline at end of file
</style>
......
......@@ -18,12 +18,12 @@
</el-row>
</el-form>
<div style="display:flex;padding:10px 20px">
<el-button icon="el-icon-search" :loading="loading" type="primary" size="small" @click="selection(1)">查 询
<el-button icon="el-icon-search" :loading="loading" type="primary" size="mini" @click="selection(1)">查 询
</el-button>
<el-button icon="el-icon-plus" type="primary" size="small" v-hasPermi="['base:goodsStationFlight:add']"
<el-button icon="el-icon-plus" type="primary" size="mini" v-hasPermi="['base:goodsStationFlight:add']"
@click="add">新 增
</el-button>
<el-button icon="el-icon-delete" type="danger" size="small" style="margin:0 10px"
<el-button icon="el-icon-delete" type="danger" size="mini" style="margin:0 10px"
:disabled="checkData.length == 0" v-hasPermi="['base:goodsStationFlight:delete']" @click="batchDel">
删 除
</el-button>
......
......@@ -2,14 +2,38 @@
<div class="cargoPage">
<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-col :span="8">
<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>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
clearable @change="planeNoChange"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="URSA">
<el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="始发站">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="海关回执状态">
<el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable
placeholder="不限">
......@@ -20,7 +44,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<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"
......@@ -29,7 +53,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="服务类型">
<el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限">
<el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
......@@ -39,59 +63,35 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
</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" :rows="4"
clearable @change="planeNoChange"></el-input>
</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" :rows="4" 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" :rows="4" 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-col :span="8">
<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>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCS原航班号">
<el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="取件日期">
<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-col :span="8">
<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>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="ACCSpool">
<el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
<el-option value="Pre-MDE" key="Pre-MDE">
......@@ -103,7 +103,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<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"
......@@ -112,7 +112,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="是否自动">
<el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
<el-option label="手动" value="1"> </el-option>
......@@ -120,7 +120,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="配舱状态">
<el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
<el-option label="已配" value="1"> </el-option>
......@@ -128,7 +128,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item>
<template slot="label">
<div style="display:inline-block">配载航线
......@@ -145,7 +145,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="预审状态">
<el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
<el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
......@@ -153,10 +153,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="发件人账号">
<el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
placeholder="请输入发件人账号（;间隔）" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -45,33 +45,24 @@
<el-col :span="6">
<el-form-item label="运单号">
<el-input type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA">
<el-input type="textarea" v-model="formData.ursa" class="formItem" placeholder="S_;P_;E2"
:rows="4" clearable>
:rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="始发站">
<el-input type="textarea" v-model="formData.siteName" class="formItem" placeholder="PVG;PEK"
:rows="4" clearable>
:rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCS原航班日期">
<el-date-picker class="formItem" type="daterange" v-model="accsDate" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="ACCS原航班号">
<el-input type="text" class="formItem" v-model="formData.flightNo" placeholder="请输入航班号"
clearable>
......@@ -85,6 +76,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="ACCS原航班日期">
<el-date-picker class="formItem" type="daterange" v-model="accsDate" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="ml20 mb20">
......@@ -147,7 +145,7 @@ export default {
watch: {
$route(to, from) {
if (to.name == 'PreMdeSelect') {
this.selection()
// this.selection()
}
}
},
......
......@@ -3,7 +3,7 @@
<el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto"
size="small">
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" clearable>
......@@ -49,7 +49,7 @@
</el-row>
</el-form>
<div class="ml20 mt20 mb20">
<el-button type="primary" icon="el-icon-search" size="small" :loading="loading" @click="select(0)">查 询
<el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查 询
</el-button>
</div>
<div style="padding:10px">
......
......@@ -5,7 +5,7 @@
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="URSA">
<el-input type="textarea" v-model="formData.ursa" placeholder="URSA之间用分号分隔，例：F2;F3;P_" rows="2">
<el-input type="textarea" v-model="formData.ursa" placeholder="例：F2;F3;P_" rows="1">
</el-input>
</el-form-item>
</el-col>
......
......@@ -33,6 +33,9 @@
<el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
</el-input>
</el-form-item>
<el-form-item label="是否为ET86航线">
<el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
</el-form-item>
<el-form-item>
<div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
</el-form-item>
......@@ -108,7 +111,7 @@ export default {
},
data() {
return {
newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined },
newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined, isEtesRoute: false },
rules: {
chineseName: [
{
......@@ -198,9 +201,11 @@ export default {
if (this.dictName === '虚拟航班') {
this.flightAdd()
} else if (this.dictName === '航线') {
let obj = {
fltNo: this.upCase(this.newDictionary.fltNo),
route: this.upCase(this.newDictionary.route)
route: this.upCase(this.newDictionary.route),
isEtesRoute: this.newDictionary.isEtesRoute == true ? "Y" : "N"
}
addRoute(obj).then(res => {
this.loading = false
......@@ -229,7 +234,7 @@ export default {
})
}
}
//批量新增
//批量新增
else if (this.status == 'allAdd') {
if (this.dictName === '虚拟航班') {
this.flightAdd()
......@@ -382,4 +387,4 @@ export default {
<style>
</style>
\ No newline at end of file
</style>
......
......@@ -34,17 +34,17 @@
</el-col>
</el-row>
<div style="margin-bottom:10px">
<el-button type="primary" icon="el-icon-search" size="small" :loading="loading"
<el-button type="primary" icon="el-icon-search" size="mini" :loading="loading"
v-if="tableName != 'serviceCode'" @click="tableSelect(1)">查询</el-button>
<el-button type="primary" icon="el-icon-plus" size="small" @click="addDic({ status: 'add' })"
<el-button type="primary" icon="el-icon-plus" size="mini" @click="addDic({ status: 'add' })"
v-hasPermi="['system:dictionary:add']">
{{ tableName === 'serviceCode' ? '新增父级' : '新增' }}
</el-button>
<el-button v-if="tableName != '航线'" type="primary" icon="el-icon-plus" size="small"
<el-button v-if="tableName != '航线'" type="primary" icon="el-icon-plus" size="mini"
@click="addDic({ status: 'allAdd' })" v-hasPermi="['system:dictionary:add']">
{{ tableName === 'serviceCode' ? '批量新增父级' : '批量新增' }}
</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" :disabled="nowSelect.length == 0"
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="nowSelect.length == 0"
@click="handleDelete" v-hasPermi="['system:dictionary:delete']">删除
</el-button>
</div>
......@@ -100,6 +100,11 @@
}}<i class="el-icon-link"></i> </el-link>
</template>
<template slot="optionColumn">
<!-- <el-table-column label="是否为ET86航线" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isEtesRoute" @change="checkboxIsEtesRoute(scope)"></el-checkbox>
</template>
</el-table-column> -->
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" style="color:#ff4949" icon="el-icon-delete"
......@@ -335,7 +340,33 @@ export default {
} else if (this.tableName === '虚拟航班') {
this.flightDel([val.id])
} else if (this.tableName === '航线') {
this.routeDel({ data: [val], id: [val.id] })
this.routeDel({ data: [val], id: [val.id] })
/*
如果该航线是普通航线直接删，如果是ET86航线，那么要查询该航线有没有设置维度，
如果没有直接删，如果已经设置了维度是否考虑将该航线下的维度删掉再进行操作;
*/
// if(!val.isEtesRoute){ // 普通航线
// this.routeDel({ data: [val], id: [val.id] })
// }else{ // ET86航线
// this.$confirm("该航线是ET86航线。是否要删除", "注意!", {
// closeOnClickModal: false,
// confirmButtonText: "确定删除",
// cancelButtonText: "取消",
// type: "warning",
// }).then(() => {
// this.msgWarning('待联调！')
// // delDict(val).then(res => {
// // if (res.code === 200) {
// // this.msgSuccess(res.msg)
// // } else {
// // this.msgWarning(res.msg)
// // }
// // this.tableSelect() // 回调查询
// // }).catch(err => {
// // console.log(err)
// // })
// }).catch(() => { })
// }
} else {
this.dicDel([val.id])
}
......
<template>
<div class="roleConfig">
<el-form ref="selectionRoleForm" label-width="auto" style="margin: 20px" @submit.native.prevent>
<el-row :gutter="50">
<el-col :span="6">
<el-form-item label="角色名称">
<el-input v-model="formData.name" placeholder="请输入角色名称" clearable></el-input>
<el-form ref="selectionRoleForm" :inline="true" label-width="auto" size="small" style="margin: 20px" @submit.native.prevent>
<el-form-item label="角色名称">
<el-input v-model="formData.name" placeholder="请输入角色名称" clearable style="width: 80%;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<el-form-item label="创建时间">
<el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<el-select v-model="formData.valid" placeholder="角色状态" clearable>
<el-form-item label="状态">
<el-select v-model="formData.valid" placeholder="角色状态" clearable style="width: 50%;">
<el-option label="启用" value="1"> </el-option>
<el-option label="停用" value="2"> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="margin:20px">
<el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="selectRoleList(0)">搜索
......@@ -34,15 +26,15 @@
:limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
:height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange">
<template slot="optionColumn">
<el-table-column header-align="center" align="left" label="操作" min-width="210px">
<el-table-column header-align="center" align="center" label="操作" min-width="210px">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改
<el-button type="primary" size="mini" @click="buttonClick(scope, 0)" class="btn-mb-4">查看</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']" class="btn-mb-4">修改
</el-button>
<el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }}
v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)" class="btn-mb-4">{{ scope.row.valid == 1 ? "停用" : "启用" }}
</el-button>
<el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" style="margin-top: 5px;margin-left: 0;">删除角色
<el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" class="btn-mb-4">删除角色
</el-button>
</template>
</el-table-column>
......
<template>
<div style="padding:20px 0">
<div>
<el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px"
@submit.native.prevent size="small">
<el-row>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="发件人账号">
<el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
maxlength="3000" rows="4" />
maxlength="3000" rows="1" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="margin-left:20px;margin-bottom:10px">
<el-button icon="el-icon-search" type="primary" size="small" @click="selection(1)">查 询
<el-button icon="el-icon-search" type="primary" size="mini" @click="selection(1)">查 询
</el-button>
<el-button v-hasPermi="['log:superAllocation:add']" icon="el-icon-plus" type="primary" size="small"
<el-button v-hasPermi="['log:superAllocation:add']" icon="el-icon-plus" type="primary" size="mini"
@click="add">添 加
</el-button>
</div>
......@@ -71,7 +71,7 @@ export default {
serviceCodeList: []
},
dialogStatus: 'add',
tableHeight: null,
tableHeight: 300,
totalCount: 0,
dialogVisible: false,
loading: false,
......@@ -80,7 +80,7 @@ export default {
created() {
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
// this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
this.selection(1)
},
methods: {
......@@ -238,4 +238,4 @@ export default {
<style lang="scss" scoped>
</style>
\ No newline at end of file
</style>
......
<template>
<div>
<el-form ref="selectionUserForm" label-width="auto" style="margin: 20px" @submit.native.prevent>
<el-row :gutter="50">
<el-col :span="6">
<el-form-item label="用户姓名">
<el-form ref="selectionUserForm" :inline="true" size="small" label-width="auto" style="margin: 20px" @submit.native.prevent>
<el-form-item label="用户姓名">
<el-input placeholder="请输入用户名称" v-model="formData.username" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机号码">
<el-form-item label="手机号码">
<el-input placeholder="请输入手机号码" v-model="formData.phone" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<el-select placeholder="用户状态" v-model="formData.isValid" clearable>
<el-select style="width: 60%;" placeholder="用户状态" v-model="formData.isValid" clearable>
<el-option label="启用" value="1"> </el-option>
<el-option label="停用" value="2"> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="margin:20px">
<el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="selectUser(0)">搜索
......@@ -32,19 +24,19 @@
:loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight"
@sizeChange="sizeChange" @currentChange="currentChange">
<template slot="optionColumn">
<el-table-column header-align="center" align="left" min-width="210px" label="操作">
<el-table-column header-align="center" align="center" min-width="210px" label="操作">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改
<el-button type="primary" size="mini" @click="buttonClick(scope, 0)" class="btn-mb-4">查看</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']" class="btn-mb-4">修改
</el-button>
<!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow"
>修改密码</el-button
> -->
<el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{
v-hasPermi="['system:user:openClose']" @click="userStatus(scope)" class="btn-mb-4">{{
scope.row.isValid == 1 ? "停用" : "启用"
}}</el-button>
<el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
<el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']" class="btn-mb-4">删除用户
</el-button>
</template>
</el-table-column>
......@@ -253,6 +245,6 @@ export default {
};
</script>
<style>
<style lang="scss" scoped>
</style>
......
......@@ -3,7 +3,7 @@
<el-form ref="archiveDataForm" class="form-header" :model="selectForm" label-width="auto" size="small"
@submit.native.prevent>
<el-row>
<el-col :span="6">
<el-col :span="7">
<el-form-item label="操作时间">
<el-date-picker class="formItem" v-model="selectForm.dateList" type="daterange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
......@@ -14,7 +14,7 @@
</el-row>
</el-form>
<div class="ml20 mb20">
<el-button type="primary" size="small" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询
<el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询
</el-button>
</div>
<Tables ref="archiveDataTables" ductName="archiveDataTables" :order="true" :border='true' :data="data"
......
......@@ -17,7 +17,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input v-model="selectForm.awbNbr" class="formItem" placeholder="请输入运单号" clearable></el-input>
<el-input v-model="selectForm.awbNbr" class="formItem" placeholder="例: xxx;xxx;" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -53,7 +53,7 @@
</el-col>
</el-row>
<div class="ml20" style="display: flex">
<el-button type="primary" size="small" icon="el-icon-search" :loading="loading" @click="selectDMData(0)">查询
<el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectDMData(0)">查询
</el-button>
</div>
</el-form>
......
......@@ -3,7 +3,7 @@
<el-form ref="operationLogForm" class="form-header" :model="selectForm" label-width="auto" size="small"
@submit.native.prevent>
<el-row>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="功能模块">
<el-select v-model="selectForm.module" class="formItem" placeholder="不限" clearable>
<el-option v-for="item in moduleList" :label="item" :value="item" :key="item"></el-option>
......@@ -22,7 +22,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-form-item label="操作时间">
<el-date-picker class="formItem" v-model="dateList" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
......@@ -32,7 +32,7 @@
</el-row>
</el-form>
<div class="ml20 mb20">
<el-button type="primary" size="small" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询
<el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectLog(1)">查 询
</el-button>
</div>
<Tables ref="operationLogTables" ductName="operationLogTables" :order="true" :border='false' :data="data"
......