Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
66b49a07 1 parent 47aea80b

UI调整

Inline Side-by-side
Showing 22 changed files with 122 additions and 160 deletions
......@@ -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() {
......
......@@ -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";
......
......@@ -39,6 +39,7 @@
@focus="inputFocus(scope)"
@input="inputEvent"
placeholder="请输入航班号"
size="small"
/>
</template>
</el-table-column>
......@@ -59,6 +60,7 @@
v-input-filter
clearable
placeholder=""
size="small"
/>
</template>
</el-table-column>
......@@ -69,7 +71,7 @@
align="center"
>
<template slot-scope="scope">
<el-select v-model="scope.row.fltRoute" placeholder="请选择">
<el-select v-model="scope.row.fltRoute" placeholder="请选择" size="small">
<el-option
v-for="item in scope.row.routeList"
:key="item.id"
......
......@@ -57,30 +57,23 @@ export default {
}
},
// 最小重量 【重量可以为空为0】
// 最小重量 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
validateMinWeight(name) {
if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(Number(this.queryForm[name]))) {
// 最小重量大于0~34，并且最小重量不得大于最大重量
if (this.queryForm[name] && this.queryForm.maxWeight) {
if (Number(this.queryForm[name]) > Number(this.queryForm.maxWeight)) {
this.$refs.minWeight.innerHTML = "";
this.$refs.minWeight.innerHTML =
"最小重量大于0~34，并且最小重量不得大于最大重量";
this.$refs.minWeight.innerHTML = "最小重量不得大于最大重量";
return false;
} else {
this.$refs.minWeight.innerHTML = "";
}
if (Number(this.queryForm[name]) > 34) {
} else if (Number(this.queryForm[name]) > 34) {
this.$refs.minWeight.innerHTML = "";
this.$refs.minWeight.innerHTML = "最大重量34KG";
return false;
} else {
this.$refs.minWeight.innerHTML = "";
}
} else if (Number(this.queryForm[name]) < 0) {
this.$refs.minWeight.innerHTML = "";
this.$refs.minWeight.innerHTML =
"最小重量大于0~34，并且最小重量不得大于最大重量";
return false;
} else if (Number(this.queryForm[name]) > 34) {
}
else if (Number(this.queryForm[name]) > 34) {
this.$refs.minWeight.innerHTML = "";
this.$refs.minWeight.innerHTML =
"最小重量大于0~34，并且最小重量不得大于最大重量";
......@@ -94,10 +87,9 @@ export default {
return false;
}
},
// 最大重量
// 最大重量 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
validateMaxWeight(name) {
// 校验输入的规则（保留两位小数）
if (/^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(this.queryForm[name]))) {
if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(Number(this.queryForm[name]))) {
if (this.queryForm[name] && this.queryForm.minWeight) {
if (Number(this.queryForm[name]) < Number(this.queryForm.minWeight)) {
this.$refs.minWeight.innerHTML = "";
......@@ -112,17 +104,14 @@ export default {
this.$refs.minWeight.innerHTML = "最大重量34KG";
return false;
}
} else if (Number(this.queryForm[name]) < 0) {
this.$refs.minWeight.innerHTML = "";
this.$refs.minWeight.innerHTML =
"最大重量大于0~34，并且最大重量不得小于最小重量";
return false;
} else if (Number(this.queryForm[name]) > 34) {
}
else if (Number(this.queryForm[name]) > 34) {
this.$refs.minWeight.innerHTML = "";
this.$refs.minWeight.innerHTML =
"最大重量大于0~34，并且最大重量不得小于最小重量";
return false;
} else {
}
else {
this.$refs.minWeight.innerHTML = "";
}
} else {
......@@ -131,9 +120,8 @@ export default {
return false;
}
},
// 最小件数 【件数可以为空但件数不得为0】
// 最小件数 【件数可以为空但件数不得为0】只能输入正整数
validateMinPieces(name) {
// 校验输入的规则（只能输入正整数）
if (/^\d+$/.test(Number(this.queryForm[name]))) {
if (this.queryForm[name] && this.queryForm.maxNumOfPieces) {
if (
......@@ -175,9 +163,8 @@ export default {
return false;
}
},
// 最大件数
// 最大件数【件数可以为空但件数不得为0】只能输入正整数
validateMaxPieces(name) {
// 校验输入的规则（只能输入正整数）
if (/^\d+$/.test(Number(this.queryForm[name]))) {
if (this.queryForm[name] && this.queryForm.minNumOfPieces) {
if (
......@@ -221,7 +208,7 @@ export default {
}
},
// 最小申报价值 【申报价值可以为空为0】
// 最小申报价值【申报价值可以为空为0】
validateMinCustomVal(name) {
// 申报价值
let value =
......@@ -249,11 +236,8 @@ export default {
this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
return false;
}
} else if (Number(this.queryForm.minSUDCustomVal) < 0) {
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minSUDCustomVal.innerHTML = "申报价值（美元）0~600";
return false;
} else if (Number(this.queryForm.minSUDCustomVal) > 600) {
}
else if (Number(this.queryForm.minSUDCustomVal) > 600) {
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
return false;
......@@ -282,11 +266,8 @@ export default {
this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
return false;
}
} else if (Number(this.queryForm.minCNYCustomVal) < 0) {
this.$refs.minCNYCustomVal.innerHTML = "";
this.$refs.minCNYCustomVal.innerHTML = "申报价值（人民币）0~2000";
return false;
} else if (Number(this.queryForm.minCNYCustomVal) > 2000) {
}
else if (Number(this.queryForm.minCNYCustomVal) > 2000) {
this.$refs.minCNYCustomVal.innerHTML = "";
this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
return false;
......@@ -301,15 +282,13 @@ export default {
return false;
}
},
// 最大申报价值
// 最大申报价值【申报价值可以为空为0】
validateMaxCustomVal(name) {
// 申报价值
let value =
this.queryForm.maxCNYCustomVal || this.queryForm.maxSUDCustomVal;
let regexp = /^(0|[1-9]\d*)(.\d{1,2})?$/.test(Number(value));
if (regexp) {
if (name == "USD" || name == "美元") {
// 申报价值（美元）0~600
if (name == "USD" || name == "美元") { // 申报价值（美元）0~600
if (
this.queryForm.minSUDCustomVal &&
this.queryForm.maxSUDCustomVal
......@@ -329,11 +308,8 @@ export default {
this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
return false;
}
} else if (Number(this.queryForm.maxSUDCustomVal) < 0) {
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minSUDCustomVal.innerHTML = "申报价值（美元）0~600";
return false;
} else if (Number(this.queryForm.maxSUDCustomVal) > 600) {
}
else if (Number(this.queryForm.maxSUDCustomVal) > 600) {
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minSUDCustomVal.innerHTML = "最大申报值不得大于600";
return false;
......@@ -362,11 +338,8 @@ export default {
this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
return false;
}
} else if (Number(this.queryForm.maxCNYCustomVal) < 0) {
this.$refs.minCNYCustomVal.innerHTML = "";
this.$refs.minCNYCustomVal.innerHTML = "申报价值（人民币）0~2000";
return false;
} else if (Number(this.queryForm.maxCNYCustomVal) > 2000) {
}
else if (Number(this.queryForm.maxCNYCustomVal) > 2000) {
this.$refs.minCNYCustomVal.innerHTML = "";
this.$refs.minCNYCustomVal.innerHTML = "最大申报值不得大于2000";
return false;
......
......@@ -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" },
},
......
<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>
......
......@@ -12,7 +12,7 @@
<el-col :span="8">
<el-form-item label="运单号">
<el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="1" :maxlength="12000" clearable></el-input>
placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -156,7 +156,7 @@
<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">
......@@ -222,4 +222,4 @@ export default {
}
</script>
<style></style>
\ No newline at end of file
<style></style>
......
......@@ -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>
......
......@@ -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>
......
<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)">搜索
......
<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)">搜索
......
......@@ -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"
......