Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
d5c665a3 1 parent 726c1b19

文本修正，文本域高度限制，代码格式整理

Inline Side-by-side
Showing 9 changed files with 433 additions and 1124 deletions
<template>
<div class="cargoAllocation">
<el-form
ref="form"
v-model="formData"
class="form-header"
label-position="right"
label-width="auto"
size="small"
>
<el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<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 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-form-item label="ACCS原航班号">
<el-input
v-model="fltNo"
placeholder="请输入ACCS原航班号"
class="formItem"
clearable
></el-input>
<el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" 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 selectData.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 selectData.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-select
placeholder="不限"
v-model="formData.statusId"
class="formItem"
clearable
>
<el-option
v-for="item in selectData.findConditionData.cargoStatus"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
<el-option v-for="item in selectData.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="ACCSpool">
<el-select
placeholder="不限"
v-model="formData.accsPool"
class="formItem"
clearable
>
<el-option
value="Pre-MDE"
key="Pre-MDE"
>
<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 value="OSPR" key="OSPR">
</el-option>
<el-option
value="Manifest"
key="Manifest"
>
<el-option value="Manifest" key="Manifest">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input
class="formItem"
type="textarea"
placeholder="请输入运单号（回车分割）"
:autosize="true"
v-model="formData.waybillNo"
clearable
></el-input>
<el-input class="formItem" type="textarea" placeholder="请输入运单号（回车分割）" :rows="1" v-model="formData.waybillNo"
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 selectData.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 selectData.findConditionData.cargoType" :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.serviceTypeId"
class="formItem"
clearable
>
<el-option
v-for="item in selectData.findConditionData.cargoServiceType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
<el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
<el-option v-for="item in selectData.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
class="formItem"
type="textarea"
placeholder="S_;P_;E2"
v-model="ursa"
:autosize="true"
clearable
></el-input>
<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-form-item label="站点">
<el-input
class="formItem"
type="textarea"
placeholder="PVG;PEK"
v-model="siteName"
:autosize="true"
clearable
></el-input>
<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-form-item label="重量区间">
<el-row>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.minWeight"
:controls="false"
:min="0"
:precision="2"
clearable
></el-input-number
></el-col>
<el-row>
<el-col :span="11">
<el-input-number class="formItem" size="mini" v-model="formData.minWeight" :controls="false" :min="0"
:precision="2" clearable></el-input-number>
</el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.maxWeight"
:controls="false"
:min="formData.minWeight"
:precision="2"
clearable
></el-input-number
></el-col>
<el-col :span="11">
<el-input-number class="formItem" size="mini" v-model="formData.maxWeight" :controls="false"
:min="formData.minWeight" :precision="2" clearable></el-input-number>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="件数区间">
<el-row>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.minNumber"
:controls="false"
:min="0"
clearable
></el-input-number
></el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11"
><el-input-number
class="formItem"
size="mini"
v-model="formData.maxNumber"
:controls="false"
:min="formData.minNumber"
clearable
></el-input-number
></el-col>
<el-col :span="11">
<el-input-number class="formItem" size="mini" v-model="formData.minNumber" :controls="false" :min="0"
clearable></el-input-number>
</el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-input-number class="formItem" size="mini" v-model="formData.maxNumber" :controls="false"
:min="formData.minNumber" clearable></el-input-number>
</el-col>
</el-row>
</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="24">
<el-form-item label="Handling Code">
<el-empty
description="暂无数据"
v-if="
!selectData.HandlingCode || selectData.HandlingCode.length == 0
"
></el-empty>
<el-empty description="暂无数据" v-if="
!selectData.HandlingCode || selectData.HandlingCode.length == 0
"></el-empty>
<el-checkbox-group v-model="handingCodes" v-else>
<el-checkbox
v-for="item in selectData.HandlingCode"
:label="item.chineseName"
v-model="item.englishName"
:key="item.id"
></el-checkbox>
<el-checkbox v-for="item in selectData.HandlingCode" :label="item.chineseName" v-model="item.englishName"
:key="item.id"></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="Sub Category">
<el-empty
description="暂无数据"
v-if="
!selectData.SubCategory || selectData.SubCategory.length == 0
"
></el-empty>
<el-empty description="暂无数据" v-if="
!selectData.SubCategory || selectData.SubCategory.length == 0
"></el-empty>
<el-checkbox-group v-model="subCategorys" v-else>
<el-checkbox
v-for="item in selectData.SubCategory"
:label="item.chineseName"
v-model="item.englishName"
:key="item.id"
></el-checkbox>
<el-checkbox v-for="item in selectData.SubCategory" :label="item.chineseName" v-model="item.englishName"
:key="item.id"></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
<div style="margin: 0 0 0 10px">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
:loading="loading"
@click="select(0)"
>查询</el-button
>
<el-button
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="mini"
v-hasPermi="['allocation:cargo:export']"
@click="xlsx(0)"
:loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button
>
<el-button
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="mini"
v-hasPermi="['allocation:cargo:export']"
@click="xlsx(1)"
:loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button
>
<el-button
type="primary"
size="mini"
v-hasPermi="['allocation:cargo:allocation']"
@click="addFit"
:disabled="tableSelection.length <= 0"
>添加到航班</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button>
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button>
<el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
:disabled="tableSelection.length <= 0">添加到航班</el-button>
<div class="tips">
<span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
<span>总件数:{{ allQty }}</span>
</div>
</div>
</el-form>
<Tables
ref="newTables"
ductName="cargo"
:data="tableData"
:headerData="tableHeader"
:totalCount="totalCount"
:loading="loading"
:selection="true"
:limitSize="size"
:limitStart="formData.limitStart"
:page="page"
:shiftKey="shiftKey"
:infoShow="false"
:height="tableHeight"
:pageSizes="[100]"
@sizeChange="sizeChange"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
@sortChange="sortChange"
></Tables>
<Dialog
:tableData="tableSelection"
:dialogVisible="dialogVisible"
@dialogBeforeClose="dialogBeforeClose"
></Dialog>
<Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :totalCount="totalCount"
:loading="loading" :selection="true" :limitSize="size" :limitStart="formData.limitStart" :page="page"
:shiftKey="shiftKey" :infoShow="false" :height="tableHeight" :pageSizes="[100]" @sizeChange="sizeChange"
@tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange"
@sortChange="sortChange"></Tables>
<Dialog :tableData="tableSelection" :dialogVisible="dialogVisible" @dialogBeforeClose="dialogBeforeClose"></Dialog>
</div>
</template>
......@@ -384,7 +203,7 @@ export default {
handingCodes: null,
subCategorys: null,
customsReceiptStatusId: null,
accsPool:"OSPR"
accsPool: "OSPR"
}, //查询数据
tableHeader: [
{
......@@ -394,7 +213,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "取件日期",
......@@ -403,7 +222,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "取件扫描号",
......@@ -412,7 +231,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "站点",
......@@ -421,7 +240,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "运单号",
......@@ -430,7 +249,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "总单号",
......@@ -439,7 +258,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "服务类型",
......@@ -448,7 +267,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "服务代码",
......@@ -457,7 +276,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "URSA",
......@@ -466,7 +285,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "申报类型",
......@@ -475,7 +294,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "HandlingCode",
......@@ -484,7 +303,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "subcategory",
......@@ -493,7 +312,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "件数",
......@@ -502,7 +321,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "实际重量",
......@@ -511,7 +330,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "收件人国家代码",
......@@ -520,7 +339,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "品名描述",
......@@ -529,7 +348,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "海关回执状态",
......@@ -538,7 +357,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "预审状态",
......@@ -547,7 +366,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "航班预审意见",
......@@ -556,7 +375,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "货物状态",
......@@ -565,7 +384,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "终配航班号",
......@@ -574,7 +393,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "终配航班日期",
......@@ -583,7 +402,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "二配航班号",
......@@ -592,7 +411,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "二配航班日期",
......@@ -601,7 +420,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "预配航班号",
......@@ -610,7 +429,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "预配航班日期",
......@@ -619,7 +438,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "ACCS原航班号",
......@@ -628,7 +447,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "ACCS原航班日期",
......@@ -637,7 +456,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "ACCS原航线",
......@@ -646,7 +465,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "是否RDE手工录入",
......@@ -655,7 +474,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "是否自动",
......@@ -664,7 +483,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "发件人账号",
......@@ -673,7 +492,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "发件公司中文名称",
......@@ -682,7 +501,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "始发地城市名称",
......@@ -691,7 +510,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "收件地",
......@@ -700,7 +519,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "尺寸",
......@@ -709,7 +528,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "大货预审意见（是否可以配置航班）",
......@@ -718,7 +537,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "大货预审时间",
......@@ -727,7 +546,7 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
disabled: true
},
{
name: "海关回执时间",
......@@ -736,7 +555,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "航班预审时间",
......@@ -745,7 +564,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "创建人",
......@@ -754,7 +573,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
{
name: "创建时间",
......@@ -763,7 +582,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled: true
},
], //表头数据
tableData: [], //表格数据
......@@ -785,7 +604,7 @@ export default {
size: 100,
allWeight: 0,
allQty: 0,
tableHeight:null,
tableHeight: null,
dialogVisible: false,
shiftKey: false,
createDate: null,
......@@ -798,14 +617,14 @@ export default {
},
created() {
this.seleData();
if(this.$store.state.tagsView.cachedViews.length == 0){
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.select();
}
},
activated(){
activated() {
this.select();
},
deactivated(){
deactivated() {
this.tableData = []
},
mounted() {
......@@ -819,7 +638,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight-60
this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60
},
methods: {
//查询条件
......@@ -829,33 +648,33 @@ export default {
if (res.code === 200) {
this.selectData.HandlingCode = res.data.handlingCode;
this.selectData.SubCategory = res.data.subCategory;
}else{
} else {
this.$message({
message: "查询条件不存在",
type: "warning",
});
}
})
.catch(() => {});
.catch(() => { });
findConditionData()
.then((res) => {
if (res.code == 200) {
this.selectData.findConditionData = res.data;
}else{
} else {
this.$message({
message: "查询条件不存在",
type: "warning",
});
}
})
.catch(() => {});
.catch(() => { });
},
//查询
async select(val) {
this.loading = true;
this.dataInfo();
if(val === 0){
if (val === 0) {
this.page = 1;
this.formData.page = 1;
}
......@@ -944,7 +763,7 @@ export default {
}
this.formData.page = this.page;
this.formData.size = this.size;
if(this.formData.waybillNo){
if (this.formData.waybillNo) {
this.formData.waybillNo = this.formData.waybillNo.trim();
}
},
......@@ -1005,7 +824,7 @@ export default {
data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
if (val.order == "descending") {
this.tableData = nullData.concat(data);
} else{
} else {
this.tableData = data.concat(nullData);
}
this.tableSelection = []
......@@ -1014,7 +833,7 @@ export default {
// item.index = index;
// });
},
sizeChange(val){
sizeChange(val) {
this.size = val
this.select(0);
},
......@@ -1078,18 +897,22 @@ export default {
margin-top: 10px;
margin-left: 50px;
}
.line {
text-align: center;
}
.el-empty {
width: 30%;
height: 37px;
padding: 0px;
line-height: 37px;
.el-empty__image {
width: 0px;
height: 0px;
}
.el-empty__description {
margin-top: 0px;
}
......
......@@ -5,31 +5,16 @@
<el-button size="small" @click="close">返回</el-button>
</div>
<template v-else>
<el-form
ref="form"
:model="form"
label-width="200px"
size="small"
:disabled="disable"
:rules="rules"
>
<el-form ref="form" :model="form" label-width="200px" size="small" :disabled="disable" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="航班号" prop="purposeOfFlightNo">
<el-input
v-model.trim="form.purposeOfFlightNo"
style="width: 60%"
:disabled="nameDisabled"
></el-input>
<el-input v-model.trim="form.purposeOfFlightNo" style="width: 60%" :disabled="nameDisabled"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班预审" prop="isNeedRequired">
<el-switch
v-model="isNeedRequired"
:active-value="1"
:inactive-value="0"
>
<el-switch v-model="isNeedRequired" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
</el-col>
......@@ -37,86 +22,45 @@
<el-form-item>
<el-row :gutter="20">
<el-col :span="6">
<el-radio v-model="isLocation" label="1" size="mini"
>站点包含</el-radio
>
<el-radio v-model="isLocation" label="2" size="mini"
>站点不包含</el-radio
>
<el-radio v-model="isLocation" label="1" size="mini">站点包含</el-radio>
<el-radio v-model="isLocation" label="2" size="mini">站点不包含</el-radio>
</el-col>
<el-col :span="6">
<el-alert
title="提示：站点之间用回车符分隔"
type="warning"
show-icon
size="mini"
:closable="false"
style="height: 30px; width: fit-content"
>
<el-alert title="提示：站点之间用回车符分隔" type="warning" show-icon size="mini" :closable="false"
style="height: 30px; width: fit-content">
</el-alert>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="站点包含" v-show="isLocation == 1">
<el-input
type="textarea"
v-model="form.location"
:rows="6"
resize="none"
style="width: 600px"
></el-input>
<el-input type="textarea" v-model="form.location" :rows="6" resize="none" style="width: 600px"></el-input>
</el-form-item>
<el-form-item label="站点不包含" v-show="isLocation == 2">
<el-input
type="textarea"
v-model="form.notLocation"
:rows="6"
resize="none"
style="width: 600px"
></el-input>
<el-input type="textarea" v-model="form.notLocation" :rows="6" resize="none" style="width: 600px"></el-input>
</el-form-item>
<el-form-item>
<el-alert
title="提示：URSA之间用分号分隔，例：F2;F3;P_"
type="warning"
show-icon
size="mini"
:closable="false"
style="height: 30px; width: fit-content"
>
<el-alert title="提示：URSA之间用分号分隔，例：F2;F3;P_" type="warning" show-icon size="mini" :closable="false"
style="height: 30px; width: fit-content">
</el-alert>
</el-form-item>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="URSA包含">
<el-input
type="textarea"
v-model.trim="form.includeUrsa"
:rows="6"
resize="none"
></el-input>
<el-input type="textarea" v-model.trim="form.includeUrsa" :rows="6" resize="none"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="URSA不包含">
<el-input
type="textarea"
v-model.trim="form.notIncludeUrsa"
:rows="6"
resize="none"
></el-input>
<el-input type="textarea" v-model.trim="form.notIncludeUrsa" :rows="6" resize="none"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="件数">
<el-col :span="3">
<el-input
class="numberInput"
v-model.trim="minNumOfPieces"
></el-input>
<el-input class="numberInput" v-model.trim="minNumOfPieces"></el-input>
<!-- <el-input-number
v-model="minNumOfPieces"
:precision="0"
......@@ -126,10 +70,7 @@
</el-col>
<el-col style="text-align: center" :span="1">-</el-col>
<el-col :span="3">
<el-input
class="numberInput"
v-model.trim="maxNumOfPieces"
></el-input>
<el-input class="numberInput" v-model.trim="maxNumOfPieces"></el-input>
<!-- <el-input-number
v-model="
form.maxNumOfPieces == 0
......@@ -180,10 +121,7 @@
<el-checkbox-group v-model="form.typeOfGoods">
<el-row>
<el-col :span="2" v-for="item in cargoType" :key="item.id">
<el-checkbox
:label="item.chineseName"
:name="item.chineseName"
>
<el-checkbox :label="item.chineseName" :name="item.chineseName">
</el-checkbox>
</el-col>
</el-row>
......@@ -196,11 +134,7 @@
<el-checkbox-group v-model="form.declarationCategory">
<el-row>
<el-col :span="3" v-for="item in cargoStatus" :key="item.id">
<el-checkbox
:label="item.chineseName"
:name="item.chineseName"
disabled
></el-checkbox>
<el-checkbox :label="item.chineseName" :name="item.chineseName" disabled></el-checkbox>
</el-col>
</el-row>
</el-checkbox-group>
......@@ -212,10 +146,7 @@
<el-checkbox-group v-model="form.serviceCode">
<el-row>
<el-col :span="2" v-for="item in serviceCode" :key="item.id">
<el-checkbox
:label="item.englishName"
:name="item.englishName"
></el-checkbox>
<el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
</el-col>
</el-row>
</el-checkbox-group>
......@@ -227,10 +158,7 @@
<el-checkbox-group v-model="form.handlingCode">
<el-row>
<el-col :span="3" v-for="item in handlingCode" :key="item.id">
<el-checkbox
:label="item.englishName"
:name="item.englishName"
></el-checkbox>
<el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
</el-col>
</el-row>
</el-checkbox-group>
......@@ -242,10 +170,7 @@
<el-checkbox-group v-model="form.subCategory">
<el-row>
<el-col :span="3" v-for="item in subCategory" :key="item.id">
<el-checkbox
:label="item.englishName"
:name="item.englishName"
></el-checkbox>
<el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
</el-col>
</el-row>
</el-checkbox-group>
......@@ -254,13 +179,8 @@
</el-form>
<div style="marginleft: 200px">
<el-button
type="primary"
size="small"
v-if="$route.params.handle != 'detail'"
@click="submit('form')"
:loading="btnLoading"
>
<el-button type="primary" size="small" v-if="$route.params.handle != 'detail'" @click="submit('form')"
:loading="btnLoading">
<span v-if="$route.params.handle === 'add'">添加</span>
<span v-else>保存</span>
</el-button>
......@@ -279,7 +199,7 @@ import {
} from "@/api/destinationFlight";
export default {
name:"",
name: "",
data() {
return {
form: {
......@@ -319,9 +239,9 @@ export default {
btnLoading: false,
loading: true,
isEmpty: false,
routeName:"",
dataId:"",
handleName:""
routeName: "",
dataId: "",
handleName: ""
};
},
methods: {
......@@ -361,7 +281,7 @@ export default {
this.formHandlingCode = this.form.handlingCode;
this.formSubCategory = this.form.subCategory;
this.form.isNeedRequired = this.isNeedRequired;
if(this.form.purposeOfFlightNo){
if (this.form.purposeOfFlightNo) {
this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
}
if (this.isLocation == 1) {
......@@ -442,7 +362,7 @@ export default {
),
1
);
this.$router.push({name:"FlightAllocConfig"})
this.$router.push({ name: "FlightAllocConfig" })
// this.$router.push(
// this.$store.state.tagsView.visitedViews[
// this.$store.state.tagsView.visitedViews.length - 1
......@@ -450,15 +370,15 @@ export default {
// );
},
removes(){
if(this.routeName == "FlightAllocConfigAdd"){
sessionStorage.setItem("flightAdd","remove")
}else{
sessionStorage.setItem("flightInfo"+this.dataId,"remove")
removes() {
if (this.routeName == "FlightAllocConfigAdd") {
sessionStorage.setItem("flightAdd", "remove")
} else {
sessionStorage.setItem("flightInfo" + this.dataId, "remove")
}
},
async dictData(){
async dictData() {
allDictData().then((response) => {
if (response.code != 200) {
this.$message({
......@@ -481,21 +401,21 @@ export default {
}
},
beforeDestroy(){
if(this.routeName == "FlightAllocConfigAdd"){
if(sessionStorage.getItem("flightAdd") == "remove"){
beforeDestroy() {
if (this.routeName == "FlightAllocConfigAdd") {
if (sessionStorage.getItem("flightAdd") == "remove") {
sessionStorage.removeItem("flightAdd")
}else{
} else {
this.form.isNeedRequired = this.isNeedRequired
sessionStorage.setItem("flightAdd",JSON.stringify(this.form))
sessionStorage.setItem("flightAdd", JSON.stringify(this.form))
}
}else{
if(sessionStorage.getItem("flightInfo"+this.dataId) == "remove"){
sessionStorage.removeItem("flightInfo"+this.dataId)
}else{
if(this.handleName == "detail"){
} else {
if (sessionStorage.getItem("flightInfo" + this.dataId) == "remove") {
sessionStorage.removeItem("flightInfo" + this.dataId)
} else {
if (this.handleName == "detail") {
this.form.isNeedRequired = this.isNeedRequired
sessionStorage.setItem("flightInfo"+this.dataId,JSON.stringify(this.form))
sessionStorage.setItem("flightInfo" + this.dataId, JSON.stringify(this.form))
}
}
}
......@@ -514,59 +434,59 @@ export default {
if (handle != "add") {
this.nameDisabled = true;
let id = this.$route.params.id;
if(sessionStorage.getItem("flightInfo"+id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail"){
if (sessionStorage.getItem("flightInfo" + id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail") {
this.loading = false
this.form = JSON.parse(sessionStorage.getItem("flightInfo"+this.$route.params.id))
this.form = JSON.parse(sessionStorage.getItem("flightInfo" + this.$route.params.id))
this.isNeedRequired = this.form.isNeedRequired;
if(this.form.notLocation != null || this.form.notLocation == ""){
if (this.form.notLocation != null || this.form.notLocation == "") {
this.isLocation = "2";
}else{
} else {
this.isLocation = "1";
}
}else{
} else {
if (isNaN(Number(id))) {
findDestinationFltRuleByActualFlight(id).then((response) => {
if (response.code != 200) {
this.$message({
showClose: true,
message: response.msg,
type: "error",
});
this.isEmpty = true;
} else if (response.data == null) {
this.isEmpty = true;
} else {
let info = response.data;
info.typeOfGoods = info.typeOfGoods
? info.typeOfGoods.split(";")
: [];
info.declarationCategory = info.declarationCategory
? info.declarationCategory.split(";")
: [];
info.serviceCode = info.serviceCode
? info.serviceCode.split(";")
: [];
info.handlingCode = info.handlingCode
? info.handlingCode.split(";")
: [];
info.subCategory = info.subCategory
? info.subCategory.split(";")
: [];
this.form = info;
if (info.notLocation != null || info.notLocation == "") {
this.isLocation = "2";
findDestinationFltRuleByActualFlight(id).then((response) => {
if (response.code != 200) {
this.$message({
showClose: true,
message: response.msg,
type: "error",
});
this.isEmpty = true;
} else if (response.data == null) {
this.isEmpty = true;
} else {
this.isLocation = "1";
let info = response.data;
info.typeOfGoods = info.typeOfGoods
? info.typeOfGoods.split(";")
: [];
info.declarationCategory = info.declarationCategory
? info.declarationCategory.split(";")
: [];
info.serviceCode = info.serviceCode
? info.serviceCode.split(";")
: [];
info.handlingCode = info.handlingCode
? info.handlingCode.split(";")
: [];
info.subCategory = info.subCategory
? info.subCategory.split(";")
: [];
this.form = info;
if (info.notLocation != null || info.notLocation == "") {
this.isLocation = "2";
} else {
this.isLocation = "1";
}
this.isNeedRequired = info.isNeedRequired;
}
this.isNeedRequired = info.isNeedRequired;
}
this.loading = false;
}).catch(()=>{
this.loading = false;
}).catch(() => {
this.loading = false;
})
} else {
//货物信息
findByFlightId(id).then((response) => {
} else {
//货物信息
findByFlightId(id).then((response) => {
if (response.code != 200) {
this.$message({
showClose: true,
......@@ -602,7 +522,7 @@ export default {
this.isNeedRequired = isNeedRequired;
}
this.loading = false;
}).catch(()=>{
}).catch(() => {
this.loading = false;
})
}
......@@ -610,13 +530,13 @@ export default {
} else {
this.loading = false;
}
if(this.$route.name == "FlightAllocConfigAdd"){
if(sessionStorage.getItem("flightAdd")){
if (this.$route.name == "FlightAllocConfigAdd") {
if (sessionStorage.getItem("flightAdd")) {
this.form = JSON.parse(sessionStorage.getItem("flightAdd"))
this.isNeedRequired = this.form.isNeedRequired;
if(this.form.notLocation != null || this.form.notLocation == ""){
if (this.form.notLocation != null || this.form.notLocation == "") {
this.isLocation = "2";
}else{
} else {
this.isLocation = "1";
}
}
......@@ -689,7 +609,7 @@ export default {
background-color: rgba(255, 255, 255, 0.5);
}
.el-checkbox__input.is-disabled + span.el-checkbox__label {
.el-checkbox__input.is-disabled+span.el-checkbox__label {
color: #303133;
}
......@@ -700,6 +620,7 @@ export default {
.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
border-color: #606266;
}
.numberInput {
input {
text-align: center;
......
<template>
<div>
<el-form
class="form-header"
:model="queryParams"
ref="queryForm"
size="medium"
:inline="true"
label-position="right"
label-width="auto"
>
<el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true"
label-position="right" label-width="auto">
<el-form-item label="原航班">
<el-input
type="text"
v-model="upCase"
placeholder="请输入原航班"
clearable
></el-input>
<el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
<!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable>
<el-option
v-for="dict in statusList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
<el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询原航班配置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
</el-form-item>
<br />
<el-form-item label="日期" prop="flightDate">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="queryParams.flightDate"
type="date"
placeholder="选择日期"
>
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="findSourceFlightAndFlightDate"
>查询实际配载航班 </el-button
>&#12288;
<el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
</el-button>&#12288;
<span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span>
</el-form-item>
<br />
<el-form-item>
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
v-hasPermi="['allocation:rand:add']"
@click="handleAdd"
>添加规则</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:rand:add']"
@click="handleAdd">添加规则</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
height="550"
size="small"
:data="sourceFlightRulesList"
highlight-current-row
border
stripe
>
<el-table v-loading="loading" height="550" size="small" :data="sourceFlightRulesList" highlight-current-row border
stripe>
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="原航班" align="center" prop="sourceFlightNo" />
<el-table-column
label="配载航班排序"
align="center"
prop="flightRank"
width="280"
/>
<el-table-column
label="周期"
align="center"
prop="dayOfWeek"
width="180"
/>
<el-table-column
label="状态"
align="center"
prop="status"
:formatter="statusFormat"
/>
<el-table-column
label="开始时间"
align="center"
prop="startDate"
width="100"
/>
<el-table-column
label="结束时间"
align="center"
prop="endDate"
width="100"
/>
<el-table-column
label="最后修改人"
align="center"
prop="updateUserName"
width="100"
/>
<el-table-column
label="最后修改时间"
align="center"
prop="updateTime"
width="100"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="180"
fixed="right"
>
<el-table-column label="配载航班排序" align="center" prop="flightRank" width="280" />
<el-table-column label="周期" align="center" prop="dayOfWeek" width="180" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="开始时间" align="center" prop="startDate" width="100" />
<el-table-column label="结束时间" align="center" prop="endDate" width="100" />
<el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" />
<el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-hasPermi="['allocation:rand:update']"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-hasPermi="['allocation:rand:delete']"
@click="handleDeleteorPlayorpause(scope.row, 0, '删除')"
>
删除</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-video-play"
v-if="scope.row.status == '3'"
v-hasPermi="['allocation:rand:openClose']"
@click="handleDeleteorPlayorpause(scope.row, 1, '启用')"
>启用</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-video-pause"
v-if="scope.row.status != '3'"
v-hasPermi="['allocation:rand:openClose']"
@click="handleDeleteorPlayorpause(scope.row, 3, '停用')"
>停用</el-button
>
<el-button size="mini" type="text" icon="el-icon-edit" v-hasPermi="['allocation:rand:update']"
@click="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" v-hasPermi="['allocation:rand:delete']"
@click="handleDeleteorPlayorpause(scope.row, 0, '删除')">
删除</el-button>
<el-button size="mini" type="text" icon="el-icon-video-play" v-if="scope.row.status == '3'"
v-hasPermi="['allocation:rand:openClose']" @click="handleDeleteorPlayorpause(scope.row, 1, '启用')">启用
</el-button>
<el-button size="mini" type="text" icon="el-icon-video-pause" v-if="scope.row.status != '3'"
v-hasPermi="['allocation:rand:openClose']" @click="handleDeleteorPlayorpause(scope.row, 3, '停用')">停用
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
layout=" prev, pager, next, jumper, sizes,total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.limit"
@pagination="findSourceFlightRules"
/>
<pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
<!-- 查看目的航班对话框 -->
<el-dialog
title="实际配载航班"
:visible.sync="openFlightDate"
width="70%"
:close-on-click-modal="false"
:append-to-body="true"
>
<el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"
:append-to-body="true">
<el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="原航班" align="center" prop="sourceFlightNo" />
<el-table-column
label="实际配载航班"
align="center"
prop="actualFlight"
width="280"
/>
<el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" />
<el-table-column label="航班日期" align="center" prop="flightDate" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleClick(scope.row.actualFlight, 'detail')"
>查看配置维度</el-button
>
<el-button size="mini" type="text" icon="el-icon-edit"
@click="handleClick(scope.row.actualFlight, 'detail')">查看配置维度</el-button>
</template>
</el-table-column>
</el-table>
......@@ -229,45 +90,19 @@
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="55%"
:append-to-body="true"
:close-on-click-modal="false"
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-position="right"
label-width="auto"
>
<el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
<el-row>
<el-col :span="8">
<el-form-item label="原航班" prop="sourceFlightNo">
<el-input
v-model="form.sourceFlightNo"
placeholder="请输入原航班号"
maxlength="10"
/>
<el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" maxlength="10" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="口岸" prop="portName">
<el-select
:disabled="true"
v-model="form.portName"
size="mini"
placeholder="选择口岸"
>
<el-option
v-for="item in portNameList"
:label="item"
:value="item"
:key="item"
>
<el-select :disabled="true" v-model="form.portName" size="mini" placeholder="选择口岸">
<el-option v-for="item in portNameList" :label="item" :value="item" :key="item">
</el-option>
</el-select>
</el-form-item>
......@@ -276,59 +111,33 @@
<el-row>
<el-col :span="8">
<el-form-item label="有效开始时间" prop="startDate">
<el-date-picker
clearable
size="small"
:picker-options="pickerOptionsStart"
v-model="form.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择开始时间"
>
<el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="有效结束时间" prop="endDate">
<el-date-picker
clearable
size="small"
:picker-options="pickerOptionsEnd"
v-model="form.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择结束时间"
>
<el-date-picker clearable size="small" :picker-options="pickerOptionsEnd" v-model="form.endDate"
type="date" value-format="yyyy-MM-dd" placeholder="选择结束时间">
</el-date-picker>
</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%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
<span
style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span>
</el-col>
<el-col :span="24">
<el-form-item label="配载航班" prop="flightRank">
<el-input
type="textarea"
v-model="form.flightRank"
:rows="4"
></el-input>
<el-input type="textarea" v-model="form.flightRank" :rows="4"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="周期段">
<el-checkbox-group v-model="dayOfWeek">
<el-checkbox
v-for="item in dayOfWeekList"
:key="item"
:label="item"
:name="item"
></el-checkbox>
<el-checkbox v-for="item in dayOfWeekList" :key="item" :label="item" :name="item"></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
......@@ -442,19 +251,19 @@ export default {
created() {
this.queryParams.portName = this.$store.state.user.activePortName;
this.portNameList = this.$store.state.user.portNames;
if(this.$store.state.tagsView.cachedViews.length == 0){
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.findSourceFlightRules();
}
},
activated(){
activated() {
this.findSourceFlightRules();
},
deactivated(){
deactivated() {
this.sourceFlightRulesList = []
},
watch:{
open(val,oldVal){
if(val){
watch: {
open(val, oldVal) {
if (val) {
this.queryParams.portName = this.$store.state.user.activePortName;
this.form.portName = this.$store.state.user.activePortName;
}
......@@ -544,7 +353,7 @@ export default {
this.msgError(response.msg);
}
})
.catch(() => {});
.catch(() => { });
},
/** 提交按钮 */
submitForm: function () {
......
......@@ -4,166 +4,70 @@
<el-row>
<el-col :span="6">
<el-form-item label="航班日期从" prop="fltDateStart">
<el-date-picker
value-format="yyyy-MM-dd"
class="formItem"
v-model="queryParams.fltDateStart"
type="date"
placeholder="选择日期"
>
<el-date-picker value-format="yyyy-MM-dd" class="formItem" 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
value-format="yyyy-MM-dd"
class="formItem"
v-model="queryParams.fltDateEnd"
type="date"
placeholder="选择日期"
>
<el-date-picker value-format="yyyy-MM-dd" class="formItem" v-model="queryParams.fltDateEnd" type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班号">
<el-input
type="textarea"
v-model="fltNo"
clearable
class="formItem"
placeholder="AC001;AC002"
rows="1"
>
<el-input type="textarea" v-model="fltNo" clearable class="formItem" placeholder="AC001;AC002" :rows="1">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input
clearable
type="textarea"
v-model="queryParams.waybillNo"
class="formItem"
placeholder="请输入运单号（回车间隔）"
rows="1"
></el-input>
<el-input clearable type="textarea" v-model="queryParams.waybillNo" class="formItem"
placeholder="请输入运单号（回车间隔）" :rows="1"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="站点">
<el-input
type="textarea"
v-model="siteName"
class="formItem"
placeholder="PVG;PEK"
clearable
rows="1"
>
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" clearable :rows="1">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="URSA">
<el-input
clearable
type="textarea"
v-model="ursa"
class="formItem"
placeholder="S_;P_;E2"
rows="1"
>
<el-input clearable type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-switch
v-model="queryParams.reExport"
active-color="#13ce66"
active-text="重新导出"
style="padding-left: 35px"
>
</el-switch>
</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"
@click="xlse()"
:loading="downLoadingTip.downloading"
icon="el-icon-download"
size="mini"
v-hasPermi="['base:caExport:export']"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出"
}}</el-button
>
<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>
</div>
</el-form>
<el-table
max-height="500"
highlight-current-row
border
stripe
v-loading="loading"
:data="tableData"
>
<el-table-column
label="运单号"
align="center"
prop="waybillNo"
/>
<el-table-column
:show-overflow-tooltip="true"
label="品牌描述"
align="center"
prop="nameDescription"
/>
<el-table-column
label="航班日期"
align="center"
prop="fltDate"
/>
<el-table-column label="航班号" align="center" prop="fltNo" width="100"/>
<el-table-column
label="航班路线"
align="center"
prop="route"
/>
<el-table-column
label="配置航班类型"
align="center"
prop="kindName"
width="130"
/>
<el-table-column label="尺寸" align="center" prop="sizeStr" width="70"/>
<el-table-column label="件数" align="center" prop="qty" width="70"/>
<el-table-column label="实际重量" align="center" prop="actualWeight" width="100"/>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
/>
<el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData">
<el-table-column label="运单号" align="center" prop="waybillNo" />
<el-table-column :show-overflow-tooltip="true" label="品牌描述" align="center" prop="nameDescription" />
<el-table-column label="航班日期" align="center" prop="fltDate" />
<el-table-column label="航班号" align="center" prop="fltNo" width="100" />
<el-table-column label="航班路线" align="center" prop="route" />
<el-table-column label="配置航班类型" align="center" prop="kindName" width="130" />
<el-table-column label="尺寸" align="center" prop="sizeStr" width="70" />
<el-table-column label="件数" align="center" prop="qty" width="70" />
<el-table-column label="实际重量" align="center" prop="actualWeight" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
layout=" prev, pager, next, jumper, sizes,total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.limitSize"
@pagination="findAllFltData"
/>
<pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.limitSize" @pagination="findAllFltData" />
</div>
</template>
......@@ -222,8 +126,9 @@ export default {
);
cargoXlse.cargoExportPreQueryDto.limitStart = 0;
cargoXlse.cargoExportPreQueryDto.limitSize = -1;
downLoadXlsx("/cargo/excelPre", cargoXlse,'航班预审表')
downLoadXlsx("/cargo/excelPre", cargoXlse, '航班预审表')
.then(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
this.progress = 100;
......@@ -233,7 +138,6 @@ export default {
this.downLoadingTip.tip = "";
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
......@@ -254,11 +158,11 @@ export default {
this.tableData = response.data.list;
this.total = response.data.totalCount;
this.loading = false;
if(response.data.list.length == 0){
if (response.data.list.length == 0) {
this.$message({
message: "未查询到数据",
type: "warning",
});
message: "未查询到数据",
type: "warning",
});
}
} else {
this.msgError(response.msg);
......
......@@ -84,8 +84,8 @@
<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" v-model="form.fltNo" placeholder="请输入航班号"
maxlength="10" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -95,9 +95,12 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="cutOff时间" prop="cutOffTime">
<el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string">
<el-form-item label="CutOff时间" prop="cutOffTime">
<el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string" filterable allow-create
default-first-option>
<el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
</el-option>
</el-select>
......@@ -108,6 +111,8 @@
<el-input style="width: 93%" v-model="form.route" placeholder="请输入航班路线" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="航班种类" prop="kindId">
<el-select v-model="form.kindId" placeholder="请选择航班种类">
......@@ -126,6 +131,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="航班状态" prop="statusId">
<el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
......@@ -141,6 +148,8 @@
v-model="form.originalWeight"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="额外增重百分比" prop="extraWeightPercent">
<el-input-number @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比" style="width: 93%"
......@@ -154,6 +163,8 @@
</el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否预审" prop="isNeedRequired">
<el-switch :disabled="true" v-model="form.isNeedRequired" :active-value="1" :inactive-value="0"
......@@ -167,6 +178,8 @@
style="width: 93%" v-model="form.highPriceWeightPercent"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="低价百分比" prop="lowPriceWeightPercent">
<el-input-number :disabled="true" placeholder="请输入低价百分比" style="width: 93%"
......@@ -179,6 +192,8 @@
v-model="form.highAvailableWeight" :precision="2"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="低价可配重量" prop="lowAvailableWeight">
<el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width: 93%"
......@@ -191,6 +206,8 @@
v-model="form.highAllocatedWeight" :precision="2"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="低价已配重量" prop="lowAllocatedWeight">
<el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width: 93%"
......@@ -304,7 +321,7 @@ export default {
disabled: true,
},
{
name: "cutOff时间",
name: "CutOff时间",
value: "cutOffTime",
width: "110",
align: "center",
......
......@@ -12,7 +12,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
clearable></el-input>
</el-form-item>
</el-col>
......@@ -27,8 +27,8 @@
</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="请输入运单号（回车间隔）" :rows="1"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -51,14 +51,14 @@
</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 type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" 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" :rows="1" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col v-show="formShow">
......
......@@ -8,78 +8,34 @@
>新增菜单</el-button
>
</div> -->
<el-table
:data="data"
row-key="id"
fit
border
stripe
highlightCurrentRow
v-loading="loading"
default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table :data="data" row-key="id" fit border stripe highlightCurrentRow v-loading="loading" default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.value === 'menuType'"
:prop="item.value"
:label="item.name"
:key="index"
:align="item.align"
header-align="center"
showOverflowTooltip
:width="item.width"
:formatter="formatter"
>
<el-table-column v-if="item.value === 'menuType'" :prop="item.value" :label="item.name" :key="index"
:align="item.align" header-align="center" :width="item.width" :formatter="formatter">
<template slot-scope="scope">
<el-tag
:type="scope.row.menuType === 'B' ? '' : 'success'"
disable-transitions
>{{ scope.row.menuType === "B" ? "按钮" : "菜单" }}</el-tag
>
<el-tag :type="scope.row.menuType === 'B' ? '' : 'success'" disable-transitions>{{ scope.row.menuType ===
"B" ? "按钮" : "菜单"
}}</el-tag>
</template>
</el-table-column>
<el-table-column
v-else
:prop="item.value"
:label="item.name"
:key="index"
:align="item.align"
header-align="center"
showOverflowTooltip
:width="item.width"
:formatter="formatter"
>
<el-table-column v-else :prop="item.value" :label="item.name" :key="index" :align="item.align"
header-align="center" :width="item.width" :formatter="formatter">
</el-table-column>
</template>
<el-table-column
header-align="center"
align="center"
label="操作"
width="auto"
>
<el-table-column header-align="center" align="center" label="操作" width="auto">
<template slot-scope="scope">
<!-- <el-button type="success" size="mini" @click="buttonClick(scope)">修改</el-button>
<el-button type="primary" size="mini" @click="buttonClick(scope)"
>查看</el-button
> -->
<el-button
:type="scope.row.status == 1 ? 'warning' : 'primary'"
v-hasPermi="['system:menu:openClose']"
size="mini"
@click="menuStatus(scope)"
v-if="scope.row.menuType == 'C'"
>{{ scope.row.status == 1 ? "停用菜单" : "启用菜单" }}</el-button
>
<el-button
type="danger"
size="mini"
v-hasPermi="['system:menu:delete']"
@click="removeMenu(scope)"
v-if="scope.row.menuType == 'C'"
>删除菜单</el-button
>
<el-button :type="scope.row.status == 1 ? 'warning' : 'primary'" v-hasPermi="['system:menu:openClose']"
size="mini" @click="menuStatus(scope)" v-if="scope.row.menuType == 'C'">{{ scope.row.status == 1 ? "停用菜单" :
"启用菜单"
}}</el-button>
<el-button type="danger" size="mini" v-hasPermi="['system:menu:delete']" @click="removeMenu(scope)"
v-if="scope.row.menuType == 'C'">删除菜单</el-button>
</template>
</el-table-column>
</el-table>
......@@ -144,7 +100,7 @@ export default {
{
name: "菜单名",
value: "title",
width: "200",
width: "",
align: "left",
sorTable: false,
},
......@@ -220,9 +176,9 @@ export default {
res.data.length > 0
? (this.data = res.data)
: this.$message({
message: "数据为空",
type: "warning",
});
message: "数据为空",
type: "warning",
});
} else {
this.$message({
message: res.msg,
......@@ -275,7 +231,7 @@ export default {
data.status = row.row.status == 1 ? "2" : "1";
this.statusUpdate(data);
})
.catch(() => {});
.catch(() => { });
},
//菜单删除
......@@ -291,7 +247,7 @@ export default {
data.status = "0";
this.statusUpdate(data);
})
.catch(() => {});
.catch(() => { });
},
formatter(row, column, cellValue, index) {
......
<template>
<div class="roleDrawer">
<el-drawer
:title="drawerTitle"
:visible.sync="drawer"
direction="rtl"
size="40%"
destroy-on-close
:close-on-click-modal="false"
:wrapperClosable="false"
:show-close="false"
>
<el-form
ref="roleForm"
:model="roleForm"
label-width="auto"
:rules="rules"
size="mini"
style="margin: 10px"
>
<el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" destroy-on-close
:close-on-click-modal="false" :wrapperClosable="false" :show-close="false">
<el-form ref="roleForm" :model="roleForm" label-width="auto" :rules="rules" size="mini" style="margin: 10px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="角色名:" prop="name">
<el-input
placeholder="请输入角色名"
v-model.trim="roleForm.name"
:disabled="roleFormDisabled"
v-if="!roleFormDisabled"
clearable
></el-input>
<el-input placeholder="请输入角色名" v-model.trim="roleForm.name" :disabled="roleFormDisabled"
v-if="!roleFormDisabled" clearable></el-input>
<div v-else>{{ roleData.name }}</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="角色描述:" prop="remark">
<el-input
v-model="roleForm.remark"
type="textarea"
placeholder="请输入角色描述"
:disabled="roleFormDisabled"
v-if="!roleFormDisabled"
clearable
></el-input>
<el-input v-model="roleForm.remark" type="textarea" placeholder="请输入角色描述" :disabled="roleFormDisabled"
v-if="!roleFormDisabled" clearable></el-input>
<div v-else>{{ roleData.remark }}</div>
</el-form-item>
</el-col>
......@@ -58,31 +32,16 @@
</el-col> -->
<el-col :span="24">
<el-form-item label="角色权限:" prop="menuIdList">
<el-tree
ref="tree"
:data="treeData"
node-key="id"
:props="defaultProps"
:show-checkbox="true"
:default-checked-keys="roleData.menuIds"
accordion
>
<el-tree ref="tree" :data="treeData" node-key="id" :props="defaultProps" :show-checkbox="true"
:default-checked-keys="roleData.menuIds" accordion>
</el-tree>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button
type="primary"
v-if="!roleFormDisabled"
size="mini"
:loading="loading"
@click="submit"
>提交</el-button
>
<el-button type="primary" size="mini" @click="handleClose"
>取消</el-button
>
<el-button type="primary" v-if="!roleFormDisabled" size="mini" :loading="loading" @click="submit">提交
</el-button>
<el-button type="primary" size="mini" @click="handleClose">取消</el-button>
</el-form-item>
</el-form>
</el-drawer>
......@@ -173,7 +132,7 @@ export default {
let formData = {};
this.loading = true;
let arr = [];
arr = this.$refs.tree.getCheckedKeys().filter((item,index)=>{
arr = this.$refs.tree.getCheckedKeys().filter((item, index) => {
return this.$refs.tree.getCheckedKeys().indexOf(item) == index
})
formData.menuIdList = arr;
......@@ -186,7 +145,7 @@ export default {
this.loading = false;
if (res.code === 200) {
this.$message({
message: "操作成功",
message: "操作成功,新增权限需重新登陆后刷新。",
type: "success",
});
this.$emit("handleClose", false);
......@@ -224,7 +183,7 @@ export default {
data.push(menuItem)
if (item.children && item.children.length) {
menuItem.children = this.treeDataInfo(item.children);
menuItem.children.unshift({id:item.id,title:`${item.title}(菜单)`})
menuItem.children.unshift({ id: item.id, title: `${item.title}(菜单)` })
}
});
return data;
......
<template>
<div class="userDrawer">
<el-drawer
:title="drawerTitle"
:visible.sync="drawer"
direction="rtl"
size="40%"
:close-on-click-modal="false"
:wrapperClosable="false"
:show-close="false"
>
<el-form
ref="userForm"
:model="userForm"
label-width="auto"
:rules="rules"
style="margin: 10px"
>
<el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" :close-on-click-modal="false"
:wrapperClosable="false" :show-close="false">
<el-form ref="userForm" :model="userForm" label-width="auto" :rules="rules" style="margin: 10px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="员工号:" prop="loginName">
<el-input
placeholder="请输入员工号"
v-model.trim="userForm.loginName"
v-if="!userFormDisabled"
:disabled="drawerTitle != '新增用户'"
size="small"
clearable
></el-input>
<el-input placeholder="请输入员工号" v-model.trim="userForm.loginName" v-if="!userFormDisabled"
:disabled="drawerTitle != '新增用户'" size="small" clearable></el-input>
<div v-else>{{ userForm.loginName }}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户姓名:" prop="username">
<el-input
placeholder="请输入用户姓名"
:disabled="userFormDisabled"
v-model.trim="userForm.username"
v-if="!userFormDisabled"
size="small"
clearable
></el-input>
<el-input placeholder="请输入用户姓名" :disabled="userFormDisabled" v-model.trim="userForm.username"
v-if="!userFormDisabled" size="small" clearable></el-input>
<div v-else>{{ userForm.username }}</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-alert
title="注意:员工号一但设置就无法更改，请谨慎填写！"
type="warning"
show-icon
size="mini"
:closable="false"
style="width: 400px"
>
<el-alert title="注意:员工号一但设置就无法更改，请谨慎填写！" type="warning" show-icon size="mini" :closable="false"
style="width: 400px">
</el-alert>
</el-col>
<el-col :span="12">
<el-form-item label="手机号:" prop="phone">
<el-input
placeholder="请输入手机号"
type="phone"
v-model.trim="userForm.phone"
:disabled="userFormDisabled"
v-if="!userFormDisabled"
size="small"
clearable
></el-input>
<el-input placeholder="请输入手机号" type="phone" v-model.trim="userForm.phone" :disabled="userFormDisabled"
v-if="!userFormDisabled" size="small" clearable></el-input>
<div v-else>{{ userForm.phone }}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电子邮箱:" prop="email">
<el-input
placeholder="请输入电子邮箱"
type="email"
v-model.trim="userForm.email"
:disabled="userFormDisabled"
v-if="!userFormDisabled"
size="small"
clearable
></el-input>
<el-input placeholder="请输入电子邮箱" type="email" v-model.trim="userForm.email" :disabled="userFormDisabled"
v-if="!userFormDisabled" size="small" clearable></el-input>
<div v-else>{{ userForm.email }}</div>
</el-form-item>
</el-col>
......@@ -104,68 +59,33 @@
</el-col> -->
<el-col :span="24">
<el-form-item label="所属口岸:" prop="portName">
<el-select
placeholder="请选择口岸"
v-model="port"
:disabled="userFormDisabled"
size="small"
style="width: 100%"
multiple
clearable
>
<el-option
v-for="item in portNameList"
:label="item.englishName"
:value="item.englishName"
:key="item.id"
>
<el-select placeholder="请选择口岸" v-model="port" :disabled="userFormDisabled" size="small"
style="width: 100%" multiple clearable>
<el-option v-for="item in portNameList" :label="item.englishName" :value="item.englishName"
:key="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="所属角色:" prop="roleIds">
<el-checkbox-group
v-model="roleid"
:disabled="userFormDisabled"
@change="change"
>
<el-checkbox
v-for="item in roleList"
:label="item.id"
:key="item.id"
>{{ item.name }}</el-checkbox
>
<el-checkbox-group v-model="roleid" :disabled="userFormDisabled" @change="change">
<el-checkbox v-for="item in roleList" :label="item.id" :key="item.id">{{ item.name }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注:" prop="remark">
<el-input
type="textarea"
v-model="userForm.remark"
placeholder="备注"
:disabled="userFormDisabled"
v-if="!userFormDisabled"
size="small"
clearable
></el-input>
<el-input type="textarea" v-model="userForm.remark" placeholder="备注" :disabled="userFormDisabled"
v-if="!userFormDisabled" size="small" clearable></el-input>
<div v-else>{{ userForm.remark }}</div>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button
type="primary"
size="mini"
v-if="!userFormDisabled"
:loading="loading"
@click="submit"
>提交</el-button
>
<el-button type="primary" size="mini" @click="handleClose"
>取消</el-button
>
<el-button type="primary" size="mini" v-if="!userFormDisabled" :loading="loading" @click="submit">提交
</el-button>
<el-button type="primary" size="mini" @click="handleClose">取消</el-button>
</el-form-item>
</el-form>
</el-drawer>
......@@ -231,22 +151,22 @@ export default {
trigger: "blur",
},
],
phone:[
phone: [
{
min:11,
max:11,
message:"请输入11位手机号码",
trigger:"blur"
min: 11,
max: 11,
message: "请输入11位手机号码",
trigger: "blur"
},
{
pattern:/^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
message:"请输入正确得手机号码"
pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
message: "请输入正确得手机号码"
}
],
email:[
email: [
{
pattern:/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
message:"请输入正确得电子邮箱"
pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
message: "请输入正确得电子邮箱"
}
]
},
......@@ -266,13 +186,13 @@ export default {
if (this.userForm.portName) {
this.port = this.userForm.portName;
}
}else{
} else {
this.loading = false;
}
},
},
methods: {
clearValidate(formName){
clearValidate(formName) {
this.$refs[formName].clearValidate();
},
change(val) {
......@@ -354,11 +274,11 @@ export default {
this.loading = false;
console.log(err);
});
}else{
} else {
this.$message({
message: "口岸不能为空",
type: "warning",
});
message: "口岸不能为空",
type: "warning",
});
}
},
},
......