Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
877007b9 1 parent bfaa4d44

增加航班迁转，维度查询按钮，货站导出功能，bug修复，样式修改

Inline Side-by-side
Showing 15 changed files with 463 additions and 92 deletions
......@@ -106,3 +106,17 @@ export function getFlightsRoutes(data) {
data: data
})
}
//航班迁转
/**
* @param ids * 货物id list
* @param flightId * 航班id
* @param route * 航线
*/
export function batchMoveCargoToOtherFlight(data) {
return request({
url: '/cargo/batchMoveCargoToOtherFlight',
method: 'post',
data: data
})
}
\ No newline at end of file
......
......@@ -10,19 +10,19 @@ export function filghtKindData() {
export function downLoadTemplate(template) {
return request({
url:'/flightInfoImport/downLoadTemplate?template=' + template,
method:'get',
responseType:'blob',
url: '/flightInfoImport/downLoadTemplate?template=' + template,
method: 'get',
responseType: 'blob',
})
}
export function importFlight(file, type){
export function importFlight(file, type) {
let formData = new FormData();
formData.append("file", file);
formData.append("type", type);
return request({
url:'/flightInfoImport/importFlight',
method:'post',
data:formData
url: '/flightInfoImport/importFlight',
method: 'post',
data: formData
})
}
\ No newline at end of file
......
......@@ -49,4 +49,14 @@ export function searchGoods(data) {
method: 'post',
data: data
})
}
//查询货站
/**
*/
export function findStationName() {
return request({
url: '/goods/findStationName',
method: 'post',
})
}
\ No newline at end of file
......
......@@ -81,8 +81,7 @@ export default {
<style lang="scss" scoped>
.container {
max-width: 350px;
min-height: 32px;
max-height: 150px;
height: 150px;
overflow-y: scroll;
padding: 0;
border: 1px solid #ccc;
......
<template>
<div>
<el-form ref="flightAllocForm" :inline="true" :model="queryParams" class="form-header" size="medium"
label-position="right" label-width="auto" @submit.native.prevent>
<el-form-item label="航班号">
<el-input v-model.trim="purposeOfFlightNo" placeholder="航班号" @keyup.enter.native="getList"></el-input>
</el-form-item>
<el-form-item label="航班日期">
<el-date-picker class="formItem" v-model="queryParams.flightDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" clearable>
</el-date-picker>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="queryParams.status" placeholder="状态">
<el-option label="有效" value="1"></el-option>
<el-option label="停用" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" :loading="loading" @click="getList" size="mini">查询</el-button>
</el-form-item>
<el-form ref="flightAllocForm" :model="queryParams" class="form-header" size="medium" label-position="right"
label-width="auto" @submit.native.prevent>
<el-row>
<el-col :span="6">
<el-form-item label="航班号">
<el-input class="formItem" v-model.trim="purposeOfFlightNo" placeholder="航班号" @keyup.enter.native="getList">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班日期">
<el-date-picker class="formItem" v-model="queryParams.flightDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" clearable :disabled="queryParams.querySpecifyData =='2'">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="状态">
<el-select class="formItem" v-model="queryParams.status" placeholder="状态">
<el-option label="有效" value="1"></el-option>
<el-option label="停用" value="3"></el-option>
</el-select>
</el-form-item>
</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="
$router.push({
......@@ -78,6 +90,7 @@ export default {
queryParams: {
purposeOfFlightNo: null,
flightDate: undefined,
querySpecifyData: '2',
status: "1",
start: 0,
limit: 20,
......@@ -149,6 +162,12 @@ export default {
}
this.open = true
},
//开关改变
switchChange(val) {
if (val == '2') {
this.queryParams.flightDate = undefined
}
},
close() {
this.open = false
},
......
<template>
<div style="padding:20px;min-height: 300px;">
<el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button>
<!-- <el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button> -->
<!-- 空状态 -->
<div v-if="isEmpty">
<el-empty description="未查询到数据！"></el-empty>
......@@ -11,7 +11,8 @@
<el-row class="mb20">
<el-col :span="6">
<el-form-item label="航班号" prop="fltNo">
<el-input v-model.tirm="infoForm.fltNo" @change="getRoutes" :disabled="fltNoDisabled" maxlength="20">
<el-input v-model.trim="infoForm.fltNo" @change="getRoutes" :disabled="fltNoDisabled"
maxlength="20">
</el-input>
</el-form-item>
</el-col>
......@@ -858,39 +859,45 @@ export default {
},
//保存
submit(val) {
this.loading = true
let routeArr = []
let data = this.setDataHandle(this.infoForm.list[val])
this.routeList.forEach((item, idx) => {
routeArr.push(item.route)
})
data.routeSpecifyDateSeq = routeArr.join(';')
data.ruleDate = this.infoForm.fltDate
this.infoForm.list[val].routePriority = this.routeList[val].routePriority
if (this.infoForm.route != null && this.infoForm.route != '') {
this.routeList.forEach(item => {
if (item.route == this.infoForm.route) {
data.routePriority = item.routePriority
}
})
data.flightRoute = this.infoForm.route
let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val])))
if (data.minNumOfPieces > data.maxNumOfPieces) {
this.msgWarning('件数前区间不能大于后区间')
} else if (data.minWeight > data.maxWeight) {
this.msgWarning('重量前区间不能大于后区间')
} else {
data.flightRoute = this.routeList[val].route
data.routePriority = this.routeList[val].routePriority
}
updateOrAddFlight(data).then(res => {
this.loading = false
if (res.code === 200) {
this.fltNoDisabled = true
this.$forceUpdate()
this.msgSuccess('保存成功！')
this.infoForm.list[val] = this.dataHandle(res.data)
this.loading = true
this.routeList.forEach((item, idx) => {
routeArr.push(item.route)
})
data.routeSpecifyDateSeq = routeArr.join(';')
data.ruleDate = this.infoForm.fltDate
this.infoForm.list[val].routePriority = this.routeList[val].routePriority
if (this.infoForm.route != null && this.infoForm.route != '') {
this.routeList.forEach(item => {
if (item.route == this.infoForm.route) {
data.routePriority = item.routePriority
}
})
data.flightRoute = this.infoForm.route
} else {
this.msgWarning(res.msg)
data.flightRoute = this.routeList[val].route
data.routePriority = this.routeList[val].routePriority
}
}).catch(err => {
console.log(err)
})
updateOrAddFlight(data).then(res => {
this.loading = false
if (res.code === 200) {
this.fltNoDisabled = true
this.$forceUpdate()
this.msgSuccess('保存成功！')
this.infoForm.list[val] = this.dataHandle(res.data)
} else {
this.msgWarning(res.msg)
}
}).catch(err => {
console.log(err)
})
}
},
//删除
del(val) {
......@@ -948,7 +955,6 @@ export default {
this.infoForm.list[val].serviceCode = []
this.infoForm.list[val].handlingCode = []
this.infoForm.list[val].subCategory = []
console.log(this.infoForm)
this.$forceUpdate()
},
//启用，停用
......
......@@ -280,6 +280,7 @@ import {
updateAutoPushBatch,
} from "@/api/findAllFltData";
import { getpreAudit } from '@/api/system/preReview.js'
import { queryRouteByFltNo } from '@/api/destinationFlight.js'
export default {
name: "FlightInformationMaintenance",
......@@ -553,8 +554,12 @@ export default {
}
});
//获取航线
this.getRoute(this.form.fltNo).then(res => {
this.routeList = res.list
queryRouteByFltNo({ fltNo: this.form.fltNo }).then(res => {
if (res.code === 200) {
this.routeList = res.data.list
} else {
this.msgWarning(res.msg)
}
}).catch(err => {
console.log(err)
})
......
<template>
<div>
<el-dialog title="新 增" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
append-to-body center>
<el-dialog :title="openStatus == 'add'?'新 增':'导出Excel'" :visible.sync="open" width="25%"
:close-on-click-modal="false" :show-close="false" append-to-body center>
<el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
<el-form-item label="货站名称" prop="goodsStation">
<el-input type="text" v-model="formData.goodsStation" maxlength="25" placeholder="请输入货站名称">
</el-input>
</el-form-item>
<el-form-item label="品名" prop="goodsList">
<el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="125"
placeholder="请输入品名，多个用“;”隔开">
</el-input>
</el-form-item>
<div v-if="openStatus == 'add'">
<el-form-item label="货站名称" prop="goodsStation">
<el-input type="text" v-model="formData.goodsStation" maxlength="25" placeholder="请输入货站名称">
</el-input>
</el-form-item>
<el-form-item label="品名" prop="goodsList">
<el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="125"
placeholder="请输入品名，多个用“;”隔开">
</el-input>
</el-form-item>
</div>
<div v-else>
<el-form-item label="货站名称" prop="goodsStation">
<el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
:loading="goodsStationLoading" placeholder="不限">
<el-option v-for="(item, index) in goodsStationList" :label="item" :value="item"
:key="item">
</el-option>
</el-select>
</el-form-item>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" :loading="loading" @click="submit">确 定</el-button>
<el-button v-if='openStatus == "add"' type="primary" :loading="loading" @click="submit">确 定</el-button>
<el-button v-else type="primary" :loading="downloading" @click="download">导出Excel</el-button>
<el-button @click="close">取 消</el-button>
</div>
</el-dialog>
......@@ -23,7 +36,8 @@
</template>
<script>
import { batchAddGoods } from "@/api/goodsStation"
import { batchAddGoods, findStationName } from "@/api/goodsStation"
import { downLoadXlsx } from "@/utils/zipdownload";
export default {
name: '',
......@@ -32,19 +46,24 @@ export default {
type: Boolean,
default: false
},
openStatus: {
type: String,
default: 'add'
}
},
data() {
return {
formData: {
goodsStation: null,
goodsList: null
goodsList: ''
},
goodsStationList: [],
rules: {
goodsStation: [
{
required: true,
message: "货站名称不能为空",
trigger: "blur",
trigger: "change",
},
],
goodsList: [
......@@ -55,12 +74,34 @@ export default {
},
],
},
goodsStationLoading: false,
downloading: false,
loading: false,
}
},
watch: {
open(val) {
if (val && this.openStatus == 'downloadExcel') {
this.getgoods()
}
}
},
methods: {
//查询货站
getgoods() {
this.goodsStationLoading = true
findStationName().then(res => {
this.goodsStationLoading = false
if (res.code === 200) {
this.goodsStationList = res.data.list
} else {
this.msgWarning(res.msg)
}
}).catch(err => {
this.goodsStationLoading = false
console.log(err)
})
},
//提交
submit() {
let obj = {}
......@@ -87,6 +128,24 @@ export default {
}
})
},
//导出Excel
download() {
this.$refs['addForm'].validate(val => {
if (val) {
this.downloading = true
let data = { goodsStation: this.formData.goodsStation }
downLoadXlsx("/goods/exportGoods", data, "货站表")
.then(() => {
this.downloading = false
this.close()
})
.catch(() => {
this.downloading = false
});
}
})
},
//取消
close() {
this.formData = {
......
<template>
<div>
<el-form class="form-header" ref="selectForm" label-width="auto" label-position="right"
<el-form class="form-header" ref="selectForm" label-position="right" label-width="auto"
style="margin-bottom:10px" @submit.native.prevent size="small">
<el-row>
<el-col :span="6">
......@@ -28,15 +28,15 @@
<el-button type="primary" icon="el-icon-download" size="small" style="margin-right:10px"
@click="downloadTempleate">下载模板
</el-button>
<el-button icon="el-icon-download" type="primary" size="small" style="margin-right:10px"
@click="downloadExcel">
导出Excel
</el-button>
<el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
:on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
class="upload-demo" v-hasPermi="['base:goodsStation:add']">
<el-button type="primary" icon="el-icon-upload2" size="small">导入Excel</el-button>
</el-upload>
<el-button icon="el-icon-download" type="primary" size="small" style="margin-left:10px"
@click="downloadExcel">
导出Excel
</el-button>
</div>
<Tables ref="goodsStation" ductName="goodsStation" :data="tableData" :headerData="tableHeader" :selection="true"
:order="true" :selectFixed="false" :totalCount="totalCount" :loading="loading"
......
<template>
<div>
<el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px"
<el-form class="form-header" ref="dictForm" label-position="right" label-width="auto" style="margin-bottom:10px"
@submit.native.prevent size="small">
<el-row>
<el-col :span="6">
......@@ -9,8 +9,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班">
<el-input v-model="selectionData.fltNo" placeholder="请输入货站名称" maxlength="20" clearable />
<el-form-item label="航班号">
<el-input v-model="selectionData.fltNo" placeholder="请输入航班号" maxlength="20" clearable />
</el-form-item>
</el-col>
</el-row>
......
......@@ -6,12 +6,12 @@
<el-row>
<el-col :span="4">
<el-form-item label="运单号">
<span>{{ data.waybillNo }}</span>
<span>{{ data.waybillNo }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="ACCSID">
<span>{{ data.accsId }}</span>
<span>{{ data.accsId }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -93,5 +93,4 @@ export default {
</script>
<style scoped>
</style>
\ No newline at end of file
......
......@@ -163,6 +163,8 @@
}}</el-button>
<el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:release']"
@click="release">释放舱位</el-button>
<el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:release']"
@click="transfer">航班迁转</el-button>
<span class="ml20" style="color: #ffba00">全部导出上限80000条数据</span>
<el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
:status="progress == 100 ? 'success' : 'warning'"></el-progress>
......@@ -206,6 +208,7 @@
</div>
</el-dialog>
<Dialog :dialogVisible="openView" :cargoData="cargoLog" @close="viewClose" />
<Info :tableData="selectTable" :dialogVisible="openTransfer" @dialogBeforeClose="dialogBeforeClose" />
</div>
</template>
......@@ -213,11 +216,13 @@
import { findConditionData, findCargoData, releaseCargo, getFlightsRoutes } from "@/api/cargoSelect";
import { downLoadXlsx } from "@/utils/zipdownload";
import Dialog from "./dialog.vue";
import Info from './info.vue'
export default {
name: "QueryCargo",
components: {
Dialog
Dialog,
Info
},
data() {
return {
......@@ -328,6 +333,7 @@ export default {
tableHeight: null,
dialogVisible: false,
openView: false,
openTransfer: false,
formShow: true, //菜单隐藏
};
},
......@@ -546,6 +552,9 @@ export default {
console.log(err)
})
},
transfer() {
this.openTransfer = true
},
//关闭弹窗
close() {
this.dialogVisible = false
......@@ -723,6 +732,11 @@ export default {
viewClose() {
this.openView = false
},
//关闭迁转
dialogBeforeClose() {
this.openTransfer = false
this.select(0)
},
//设置关闭
headerSetClose(val) {
if (val == 1) {
......
<template>
<div>
<el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
:append-to-body="true">
<el-divider content-position="left">已选货物信息</el-divider>
<el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
style="width: 100%">
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column v-for="(item, index) in cargoHeader" header-align="center" align="center" :prop="item.value"
:label="item.name" :key="index" :show-overflow-tooltip="true" :formatter="formatter">
</el-table-column>
</el-table>
<el-form ref="form" class="form-header" label-position="right" label-width="auto"
style="width: 400px; margin: 30px auto" :model="formData" :rules="rules">
<el-form-item label="航班号" prop="fltNo">
<el-input class="formItem" v-model="fltNo" size="medium" placeholder="请输入航班号" maxlength="20"
style="width: 350px" @change="dateChange"></el-input>
</el-form-item>
<el-form-item label="航班日期:" prop="fltDate">
<el-date-picker class="formItem" v-model="formData.fltDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" size="medium" style="width: 350px" @change="dateChange">
</el-date-picker>
</el-form-item>
<el-form-item prop="route">
<template slot="label">
<div style="display:inline-block">航线:
<el-tooltip class="item" effect="dark" content="选择航线需要先输入航班号和航班日期，才能选择对应得航线" placement="top-start">
<span class="el-icon-warning" style="color:#1890ff;font-size:16px"></span>
</el-tooltip>
</div>
</template>
<el-select class="formItem" v-model="formData.route" placeholder="不限" :disabled="routeList.length == 0">
<el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index">
<Tooltips :content="item.route" :refName="item.route"></Tooltips>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer">
<el-button @click="dialogBeforeClose">取 消</el-button>
<el-button type="primary" @click="submit" :loading="loading">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { batchMoveCargoToOtherFlight, findFlightRoute } from "@/api/cargoSelect";
export default {
props: {
dialogVisible: {
type: Boolean,
default: false,
},
tableData: {
type: Array,
default: null,
},
},
data() {
return {
formData: {
ids: [],
fltNo: undefined,
fltDate: undefined,
route: undefined,
overweight: false,
},
cargoHeader: [
{ name: "口岸代码", value: "portName" },
{ name: "运单号", value: "waybillNo" },
{ name: "货物状态", value: "statusName" },
{ name: "站点", value: "siteName" },
{ name: "申报类型", value: "typeName" },
{ name: "URSA", value: "ursa" },
{ name: "实际重量", value: "actualWeight" },
{ name: "件数", value: "qty" },
{ name: "ACCS原航班号", value: "fltNoAccs" },
{ name: "ACCS原航班日期", value: "fltDateAccs" },
{ name: "品名描述", value: "nameDescription" },
{ name: "是否自动", value: "cargoRulesStatus" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
],
routeList: [],
rules: {
fltNo: [
{
required: true,
message: "航班号不能为空",
trigger: "blur",
},
],
fltDate: [
{
required: true,
message: "航班日期不能为空",
trigger: "blur",
},
],
route: [
{
required: true,
message: "航线不能为空",
trigger: "blur",
},
],
},
loading: false,
};
},
methods: {
cleaerForm() {
this.formData = {
ids: [],
fltNo: undefined,
fltDate: undefined,
route: undefined,
flightId: undefined,
overweight: false,
};
this.routeList = []
},
//确定配舱
submit() {
this.loading = true;
let arr = [];
this.tableData.forEach((item) => {
arr.push(item.id);
});
this.formData.ids = arr;
this.routeList.forEach(item => {
if (item.route === this.formData.route) {
this.formData.flightId = item.id
}
})
if (this.formData.fltNo && this.formData.fltDate) {
batchMoveCargoToOtherFlight(this.formData).then((res) => {
this.loading = false;
//code 200 迁转成功 202 重量已满需要确认 其余code直接输出msg
if (res.code === 200) {
this.msgSuccess('货物迁转成功')
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
} else if (res.code === 202) {
this.$confirm(res.msg, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formData.overweight = true; //确定继续overweight变为true再次请求接口
batchMoveCargoToOtherFlight(this.formData).then((res) => {
if (res.code === 200) {
this.msgSuccess('货物迁转成功')
} else {
this.msgWarning(res.msg)
}
});
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
})
.catch(() => {
//取消 取消当前配舱
this.msgSuccess('迁转已取消')
this.cleaerForm();
this.$emit("dialogBeforeClose", {
close: false,
reload: true,
});
});
} else {
this.loading = false;
this.msgWarning(res.msg)
}
}).catch(() => {
this.loading = false;
});
} else {
this.loading = false;
this.msgWarning('航班号或航班日期不能为空')
}
},
dialogBeforeClose() {
this.cleaerForm();
this.$refs['form'].clearValidate();
this.$emit("dialogBeforeClose", { close: false, reload: true });
},
formatter(row, column, cellValue, index) {
if (column.property == "cargoRulesStatus") {
if (cellValue == 1) {
return "手动"
} else {
return "自动"
}
}
return cellValue
},
//日期选择变化
dateChange(val) {
this.routeList = []
if (this.formData.fltNo && this.formData.fltNo != null && this.formData.fltNo != '') {
if (this.formData.fltDate && this.formData.fltDate != null && this.formData.fltDate != '') {
let obj = {
fltNo: this.formData.fltNo,
fltDate: this.formData.fltDate,
}
findFlightRoute(obj).then(res => {
if (res.code === 200) {
res.data[0].route.indexOf(';') <= 0 ?
this.routeList = res.data :
res.data[0].route.split(';').forEach(item => {
this.routeList.push({ id: res.data[0].id, route: item })
})
} else {
this.msgWarning(res.msg)
}
}).catch(err => {
console.log(err)
})
} else {
this.msgWarning('航班日期不能为空')
}
} else {
this.msgWarning('航班号不能为空')
}
}
},
computed: {
fltNo: {
get: function () {
return this.formData.fltNo;
},
set: function (val) {
this.formData.fltNo = this.upCase(val);
},
},
},
};
</script>
<style>
</style>
\ No newline at end of file
......@@ -26,7 +26,7 @@
<div v-else-if="dictName == '航线'">
<div v-if="status == 'add'">
<el-form-item label="航班号" prop="fltNo">
<el-input type="text" v-model="newDictionary.fltNo" placeholder="请输入航班号" maxlength="50">
<el-input type="text" v-model="newDictionary.fltNo" placeholder="请输入航班号" maxlength="20">
</el-input>
</el-form-item>
<el-form-item label="航线" prop="route">
......@@ -36,7 +36,7 @@
</div>
<div v-else-if="status == 'sort'">
<el-form-item label="航班号" prop="fltNo">
<el-input type="text" v-model="newDictionary.fltNo" disabled></el-input>
<el-input type="text" v-model="newDictionary.fltNo" disabled maxlength="20"></el-input>
</el-form-item>
<el-form-item label="航线">
<Drag :routes="routeList" @drag="drag"></Drag>
......@@ -377,4 +377,5 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
......
......@@ -172,7 +172,7 @@ export default {
if (tip === "停用") {
getReleaseWeight({ id: val.id }).then(res => {
if (res.code === 200) {
this.$confirm(`预计释放仓位为${res.data},是否确定！`, "注意！", {
this.$confirm(`预计释放舱位为${res.data},是否确定！`, "注意！", {
confirmButtonText: "确定",
cancelButtonText: '取消',
type: "warning",
......