Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
6a82cec2 1 parent 5f942ddb

待测试功能代码增加

Inline Side-by-side
Showing 8 changed files with 1079 additions and 211 deletions
import request from '@/utils/request'
// DM数据查询
/**
* @param createTime 创建时间 *
* @param fltNo 航班号
* @param fltDate 航班日期
* @param status 状态
* @param portName 口岸名称
* @param page 页数 *
* @param size 数据长度
*/
export function getDmDataList(data) {
return request({
url: '/dmDataLog/getDmDataList',
method: 'post',
data: data
})
}
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650528704724" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2035" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M396.00128 892.68224c-130.6624-16.62976-247.6032-63.52896-247.6032-122.38336V692.8384c51.48672 38.62528 131.8912 66.23232 225.64864 79.33952 0.4096-20.84864 2.8672-41.21088 7.24992-60.87168-124.60032-18.14528-232.89856-63.7696-232.89856-120.34048v-77.45536c61.80864 46.36672 165.0688 77.08672 283.4432 85.44256a310.12864 310.12864 0 0 1 54.84544-58.61376c-161.792-2.176-338.28864-56.44288-338.28864-128.77824V354.05824C221.30688 408.69888 351.55968 442.04032 496.64 442.04032c145.03936 0 275.328-33.30048 348.24192-87.98208v57.50784c0 28.22144-27.02848 53.69856-69.4272 74.42432a307.38944 307.38944 0 0 1 65.29024 30.22848c1.26976-0.94208 2.8672-1.76128 4.1728-2.70336v5.24288a307.26144 307.26144 0 0 1 60.87168 50.5856V252.1088c0-108.25728-175.88224-189.89056-409.10848-189.89056s-409.1904 81.63328-409.1904 189.89056v518.18496c0 98.01728 144.26112 173.95712 344.55552 187.51488a306.62144 306.62144 0 0 1-36.0448-65.1264zM496.64 123.12576c164.40832 0 348.24192 55.17312 348.24192 128.98304S661.04832 381.09184 496.64 381.09184c-164.37248 0-348.20096-55.17312-348.20096-128.98304S332.26752 123.12576 496.64 123.12576z" p-id="2036"></path><path d="M731.4176 907.264l-95.0272-72.25344h-11.1872c-5.57056 0-5.57056 5.61152-5.57056 11.10016v38.87104c-39.15264-22.20032-67.09248-61.07136-72.65792-105.50784 0-11.10016-16.7936-22.24128-27.97568-22.24128-11.18208 0-22.36416 16.74752-22.36416 27.84768 5.61152 44.4416 27.97568 83.30752 55.9104 111.08352 22.36416 16.62976 44.72832 33.30048 67.09248 44.4416v44.44672c0 5.5296 0 5.5296 5.57056 5.5296 5.61664 5.61152 5.61664 5.61152 11.1872 5.61152l95.0272-72.25344s5.61664-5.5296 5.61664-11.10016c-0.00512-0.04608-0.00512-5.57568-5.62176-5.57568z m162.16064-183.25504l39.12192-22.24128c5.61152 0 5.61152-5.57056 5.61152-11.10016s0-5.5296-5.61152-11.10016l-111.8208-44.40064h-11.14112c-5.57056 0-5.57056 5.52448-5.57056 5.52448l-5.61664 122.22464c0 5.5296 0 5.5296 5.61664 5.5296h11.14112l33.54624-22.20032c0 44.4416-16.7936 88.84224-55.9104 116.65408-11.1872 11.10016-11.1872 22.20032-5.61664 33.30048 11.1872 11.10016 22.36928 11.10016 33.5104 0 55.95136-33.37728 83.97312-105.5488 72.73984-172.19072z m-234.7776-72.25344c0-5.5296 0-5.5296-5.61152-11.10016l-33.55136-16.62976c39.15776-22.20032 83.8912-27.77088 128.61952-11.10016 11.14112 5.61664 27.9296 0 33.50016-16.62976 5.61664-11.10016 0-27.77088-16.74752-33.30048-61.48096-22.20032-139.8016-5.57056-190.09536 33.30048l-44.72832-22.24128h-11.18208c0 5.61152-5.57056 5.61152 0 11.10016l11.18208 116.65408s0 5.57056 5.61664 5.57056h11.18208l111.8208-50.01216v-5.61152h-0.00512z" p-id="2037"></path></svg>
\ No newline at end of file
......@@ -21,13 +21,13 @@ let ductLabels = {
},
"role": {//角色设置
"valid": {
"1": "开启",
"1": "启用",
"2": "关闭",
},
},
"user": {//用户设置
"isValid": {
"1": "开启",
"1": "启用",
"2": "关闭",
},
},
......@@ -55,6 +55,9 @@ let ductLabels = {
"1": "已处理",
"2": "处理失败",
"3": "无需处理",
"4": "校验不通过",
"5": "数据不能被多次处理",
"9": "处理中",
},
}
}
......
......@@ -89,8 +89,8 @@ export const constantRoutes = [
]
export default new Router({
mode: 'history', // 去掉url中的#
mode: 'hash', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes,
base: '/iMac'
base: '/test'
})
\ No newline at end of file
......
......@@ -72,7 +72,7 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-col :span="6">
<el-form-item label="ACCSpool">
<el-select
placeholder="不限"
......@@ -97,7 +97,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input
......@@ -181,6 +181,7 @@
:controls="false"
:min="0"
:precision="2"
clearable
></el-input-number
></el-col>
<el-col class="line" :span="2">-</el-col>
......@@ -192,6 +193,7 @@
:controls="false"
:min="formData.minWeight"
:precision="2"
clearable
></el-input-number
></el-col>
</el-row>
......@@ -207,6 +209,7 @@
v-model="formData.minNumber"
:controls="false"
:min="0"
clearable
></el-input-number
></el-col>
<el-col class="line" :span="2">-</el-col>
......@@ -217,6 +220,7 @@
v-model="formData.maxNumber"
:controls="false"
:min="formData.minNumber"
clearable
></el-input-number
></el-col>
</el-row>
......@@ -308,7 +312,7 @@
size="mini"
v-hasPermi="['allocation:cargo:allocation']"
@click="addFit"
:disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'"
:disabled="tableSelection.length <= 0"
>添加到航班</el-button
>
<div class="tips">
......@@ -319,16 +323,20 @@
</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"
......@@ -376,31 +384,10 @@ export default {
handingCodes: null,
subCategorys: null,
customsReceiptStatusId: null,
// accsPool:"OSPR"
accsPool:"OSPR"
}, //查询数据
tableHeader: [
{
type: "selection",
name: "",
value: "",
width: "50",
align: "center",
sorTable: false,
fixed: true,
disabled:true
},
{
type: "index",
name: "",
value: "",
width: "50",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "100",
......@@ -410,7 +397,6 @@ export default {
disabled:true
},
{
type: "",
name: "取件日期",
value: "pickUpDate",
width: "120",
......@@ -420,7 +406,6 @@ export default {
disabled:true
},
{
type: "",
name: "取件扫描号",
value: "pickUpScanNo",
width: "120",
......@@ -430,7 +415,6 @@ export default {
disabled:true
},
{
type: "",
name: "站点",
value: "siteName",
width: "80",
......@@ -440,7 +424,6 @@ export default {
disabled:true
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "120",
......@@ -450,7 +433,6 @@ export default {
disabled:true
},
{
type: "",
name: "总单号",
value: "totalWaybillNo",
width: "120",
......@@ -460,7 +442,6 @@ export default {
disabled:true
},
{
type: "",
name: "服务类型",
value: "serviceTypeName",
width: "100",
......@@ -470,7 +451,6 @@ export default {
disabled:true
},
{
type: "",
name: "服务代码",
value: "serviceCode",
width: "100",
......@@ -480,7 +460,6 @@ export default {
disabled:true
},
{
type: "",
name: "URSA",
value: "ursa",
width: "100",
......@@ -490,7 +469,6 @@ export default {
disabled:true
},
{
type: "",
name: "申报类型",
value: "typeName",
width: "100",
......@@ -500,7 +478,6 @@ export default {
disabled:true
},
{
type: "",
name: "HandlingCode",
value: "handingCode",
width: "150",
......@@ -510,7 +487,6 @@ export default {
disabled:true
},
{
type: "",
name: "subcategory",
value: "subCategory",
width: "140",
......@@ -520,7 +496,6 @@ export default {
disabled:true
},
{
type: "",
name: "件数",
value: "qty",
width: "80",
......@@ -530,7 +505,6 @@ export default {
disabled:true
},
{
type: "",
name: "实际重量",
value: "actualWeight",
width: "100",
......@@ -540,7 +514,6 @@ export default {
disabled:true
},
{
type: "",
name: "收件人国家代码",
value: "consigneeCountry",
width: "150",
......@@ -550,7 +523,6 @@ export default {
disabled:true
},
{
type: "",
name: "品名描述",
value: "nameDescription",
width: "100",
......@@ -560,7 +532,6 @@ export default {
disabled:true
},
{
type: "",
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "140",
......@@ -570,7 +541,6 @@ export default {
disabled:true
},
{
type: "",
name: "预审状态",
value: "preQualificationStatus",
width: "100",
......@@ -580,7 +550,6 @@ export default {
disabled:true
},
{
type: "",
name: "航班预审意见",
value: "caPretrialOpinion",
width: "120",
......@@ -590,7 +559,6 @@ export default {
disabled:true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "100",
......@@ -600,7 +568,6 @@ export default {
disabled:true
},
{
type: "",
name: "终配航班号",
value: "finalFlightNo",
width: "120",
......@@ -610,7 +577,6 @@ export default {
disabled:true
},
{
type: "",
name: "终配航班日期",
value: "finalFlightTime",
width: "140",
......@@ -620,7 +586,6 @@ export default {
disabled:true
},
{
type: "",
name: "二配航班号",
value: "twoMatchFlightNo",
width: "120",
......@@ -630,7 +595,6 @@ export default {
disabled:true
},
{
type: "",
name: "二配航班日期",
value: "twoMatchFlightTime",
width: "150",
......@@ -640,7 +604,6 @@ export default {
disabled:true
},
{
type: "",
name: "预配航班号",
value: "preplanFlightNo",
width: "120",
......@@ -650,7 +613,6 @@ export default {
disabled:true
},
{
type: "",
name: "预配航班日期",
value: "preplanFlightTime",
width: "150",
......@@ -660,7 +622,6 @@ export default {
disabled:true
},
{
type: "",
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
......@@ -670,7 +631,6 @@ export default {
disabled:true
},
{
type: "",
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "150",
......@@ -680,7 +640,6 @@ export default {
disabled:true
},
{
type: "",
name: "ACCS原航线",
value: "accsFlightRoute",
width: "140",
......@@ -690,7 +649,6 @@ export default {
disabled:true
},
{
type: "",
name: "是否RDE手工录入",
value: "manualRde",
width: "170",
......@@ -700,7 +658,6 @@ export default {
disabled:true
},
{
type: "",
name: "是否自动",
value: "cargoRulesStatus",
width: "100",
......@@ -710,7 +667,6 @@ export default {
disabled:true
},
{
type: "",
name: "发件人账号",
value: "shipperAccount",
width: "120",
......@@ -720,7 +676,6 @@ export default {
disabled:true
},
{
type: "",
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
......@@ -730,7 +685,6 @@ export default {
disabled:true
},
{
type: "",
name: "始发地城市名称",
value: "originCity",
width: "130",
......@@ -740,7 +694,6 @@ export default {
disabled:true
},
{
type: "",
name: "收件地",
value: "destinationSiteName",
width: "90",
......@@ -750,7 +703,6 @@ export default {
disabled:true
},
{
type: "",
name: "尺寸",
value: "sizeStr",
width: "80",
......@@ -760,7 +712,6 @@ export default {
disabled:true
},
{
type: "",
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "250",
......@@ -770,7 +721,6 @@ export default {
disabled:true
},
{
type: "",
name: "大货预审时间",
value: "bigPretrialTime",
width: "120",
......@@ -780,7 +730,6 @@ export default {
disabled:true
},
{
type: "",
name: "海关回执时间",
value: "customsReceiptTime",
width: "150",
......@@ -790,7 +739,6 @@ export default {
disabled:true
},
{
type: "",
name: "航班预审时间",
value: "caPretrialTime",
width: "150",
......@@ -800,7 +748,6 @@ export default {
disabled:true
},
{
type: "",
name: "创建人",
value: "createUserName",
width: "90",
......@@ -810,7 +757,6 @@ export default {
disabled:true
},
{
type: "",
name: "创建时间",
value: "createTime",
width: "100",
......@@ -859,6 +805,9 @@ export default {
activated(){
this.select();
},
deactivated(){
this.tableData = []
},
mounted() {
window.addEventListener("keydown", (code) => {
if (code.keyCode === 16 && code.shiftKey) {
......@@ -1118,9 +1067,6 @@ export default {
},
},
},
deactivated(){
this.tableData = []
},
};
</script>
......
......@@ -8,7 +8,7 @@
size="small"
:model="formData"
>
<el-row type="flex" style="flexWrap: wrap!important">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-form-item label="配舱航班日期">
<el-date-picker
......@@ -19,13 +19,21 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配载航班号">
<el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input>
<el-input
type="textarea"
v-model="cargoPlaneNo"
class="formItem"
placeholder="AC001;AC002"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -55,27 +63,28 @@
class="formItem"
placeholder="请输入运单号（回车间隔）"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="申报类别">
<el-select
placeholder="不限"
v-model="formData.typeId"
class="formItem"
clearable
>
<el-option
v-for="item in findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
<el-select
placeholder="不限"
v-model="formData.typeId"
class="formItem"
clearable
>
</el-option>
</el-select>
<el-option
v-for="item in findConditionData.cargoType"
:label="item.chineseName"
:value="item.id"
:key="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col>
<el-col :span="6">
<el-form-item label="服务类型">
<el-select
......@@ -103,6 +112,7 @@
class="formItem"
placeholder="S_;P_;E2"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -114,11 +124,12 @@
class="formItem"
placeholder="PVG;PEK"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-show="formShow">
<el-row type="flex" style="flexWrap: wrap!important">
<el-col v-show="formShow">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
<el-form-item label="ACCS原航班日期">
<el-date-picker
......@@ -129,22 +140,31 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCS原航班号">
<el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
<el-input
type="text"
v-model="fltNo"
class="formItem"
placeholder="请输入ACCS航班号"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker
class="formItem"
v-model="formData.pickUpDate"
type="date"
placeholder="选择日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -159,11 +179,38 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="ACCSpool">
<el-select
placeholder="不限"
v-model="formData.accsPool"
class="formItem"
clearable
>
<el-option
value="Pre-MDE"
key="Pre-MDE"
>
</el-option>
<el-option
value="OSPR"
key="OSPR"
>
</el-option>
<el-option
value="Manifest"
key="Manifest"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货物状态">
<el-select
placeholder="不限"
......@@ -190,23 +237,15 @@
class="formItem"
clearable
>
<el-option
label="手动"
value="1"
>
</el-option>
<el-option
label="自动"
value="2"
>
</el-option>
<el-option label="手动" value="1"> </el-option>
<el-option label="自动" value="2"> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
<div style="paddingLeft: 10px;marginTop:20px">
<div style="paddingLeft: 10px; marginTop: 20px">
<el-button
type="primary"
icon="el-icon-search"
......@@ -215,19 +254,55 @@
@click="select(0)"
>查询</el-button
>
<el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']"
>{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
<el-button
v-hasPermi="['base:cargo:export']"
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small"
@click="xlse(0)"
:disabled="tableData.length == 0"
:loading="downLoadingTip.downloading"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button
>
<el-button
v-hasPermi="['base:cargo:export']"
:type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small"
@click="xlse(1)"
:disabled="tableData.length == 0"
:loading="downLoadingTip.downloading"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button
>
<el-button
type="primary"
size="small"
:disabled="selectTable.length==0"
v-hasPermi="['base:cargo:export']"
@click="release"
>释放舱位</el-button
>
<el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']"
>{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
<span style="marginLeft: 20px; color: #ffba00"
>全部导出上限80000条数据</span
>
<span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span>
<el-progress v-if="progress!=0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress>
<el-progress
v-if="progress != 0"
class="progress"
:stroke-width="12"
:show-text="true"
:percentage="progress"
:status="progress == 100 ? 'success' : 'warning'"
></el-progress>
<div class="tips">
<span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
<span>总件数:{{ allQty }}</span>
</div>
<div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div>
<div class="formShow" @click="formShow = !formShow">
<i class="el-icon-s-tools"></i
>{{ formShow ? "收起条件" : "更多条件" }}
</div>
</div>
</el-form>
<Tables
......@@ -252,16 +327,49 @@
@currentChange="currentChange"
@sortChange="sortChange"
></Tables>
<el-dialog
title="舱位释放结果"
width="80%"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
:show-close="false"
:append-to-body="true"
>
<el-table
:data="selectTable"
size="mini"
border
stripe
highlight-current-row
style="width: 100%"
>
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column
v-for="(item, index) in releaseHeader"
header-align="center"
align="center"
:prop="item.value"
:label="item.name"
:key="index"
:show-overflow-tooltip="true"
>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" @click="close">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { findConditionData, findCargoData } from "@/api/cargoSelect";
import { findConditionData, findCargoData , releaseCargo } from "@/api/cargoSelect";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx"
import { upCase } from "@/utils/FedEx";
export default {
name:"QueryCargo",
name: "QueryCargo",
data() {
return {
formData: {
......@@ -286,21 +394,21 @@ export default {
dataSources: "",
customsReceiptStatusId: null,
big: null,
cargoPlaneNo:null,
cargoPlaneStart:null,
cargoPlaneEnd:null,
cargoPlaneNo: null,
cargoPlaneStart: null,
cargoPlaneEnd: null,
limitStart: 1,
limitSize:100,
limitSize: 100,
}, //表单数据
tableHeader: [
{
name: "口岸代码",
value: "portName",
width: "120",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
disabled:true,
},
{
name: "取件日期",
......@@ -332,7 +440,7 @@ export default {
{
name: "运单号",
value: "waybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
......@@ -341,7 +449,7 @@ export default {
{
name: "总单号",
value: "totalWaybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
......@@ -359,7 +467,7 @@ export default {
{
name: "服务代码",
value: "serviceCode",
width: "90",
width: "100",
align: "center",
sorTable: false,
fixed: false,
......@@ -375,6 +483,24 @@ export default {
disabled:true
},
{
name: "推送状态",
value: "cargoAllocationDataStatus",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
name: "释放状态",
value: "releasing",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
name: "申报类型",
value: "typeName",
width: "100",
......@@ -395,7 +521,7 @@ export default {
{
name: "subcategory",
value: "subCategory",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
......@@ -458,13 +584,22 @@ export default {
{
name: "航班预审意见",
value: "caPretrialOpinion",
width: "140",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
name: "AccsPool",
value: "accsPool",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
name: "货物状态",
value: "statusName",
width: "100",
......@@ -476,7 +611,7 @@ export default {
{
name: "终配航班号",
value: "finalFlightNo",
width: "130",
width: "120",
align: "center",
sorTable: true,
fixed: false,
......@@ -485,7 +620,7 @@ export default {
{
name: "终配航班日期",
value: "finalFlightTime",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
......@@ -494,7 +629,7 @@ export default {
{
name: "二配航班号",
value: "twoMatchFlightNo",
width: "130",
width: "120",
align: "center",
sorTable: true,
fixed: false,
......@@ -512,7 +647,7 @@ export default {
{
name: "预配航班号",
value: "preplanFlightNo",
width: "130",
width: "120",
align: "center",
sorTable: true,
fixed: false,
......@@ -530,7 +665,7 @@ export default {
{
name: "ACCS原航班号",
value: "fltNoAccs",
width: "140",
width: "150",
align: "center",
sorTable: true,
fixed: false,
......@@ -548,7 +683,7 @@ export default {
{
name: "ACCS原航线",
value: "accsFlightRoute",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
......@@ -575,7 +710,7 @@ export default {
{
name: "发件人账号",
value: "shipperAccount",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
......@@ -593,7 +728,7 @@ export default {
{
name: "始发地城市名称",
value: "originCity",
width: "150",
width: "130",
align: "center",
sorTable: false,
fixed: false,
......@@ -629,7 +764,7 @@ export default {
{
name: "大货预审时间",
value: "bigPretrialTime",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
......@@ -665,36 +800,109 @@ export default {
{
name: "创建时间",
value: "createTime",
width: "120",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
], //表头数据
releaseHeader:[
{
type: "",
name: "提示信息",
value: "msg",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "推送状态",
value: "cargoAllocationDataStatus",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "释放状态",
value: "releasing",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "accsPool",
value: "accsPool",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "",
align: "center",
sorTable: true,
fixed: false,
disabled:true
}
],
findConditionData: {}, //货物查询条件
tableData: [], //表格数据
tableData:[], //表格数据
allWeight: 0,
allQty: 0,
shiftKey: false,
valueFormat: "yyyy-MM-dd",
tableLoading: false,
downLoadingTip:{
tip:"",
downloading:false,
},
downLoadingTip: {
tip: "",
downloading: false,
}, //导出状态
totalCount: 0,
selectTable: [],
flightTime: [],
prepalyFlightTime: [],
cargoPlaneTime:[],
cargoPlaneTime: [],
createDate: [],
limitStart: 1,
limitSize: 100, //无限制-1
page:1,
progress:0,
page: 1,
progress: 0,
tableHeight:null,
formShow:true,
dialogVisible:false,
formShow: true, //菜单隐藏
};
},
created() {
......@@ -736,9 +944,13 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-80
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50
},
watch:{
formShow(val,oldVal){
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-120
}
},
methods: {
clear() {
this.$refs.cargoForm.resetFields();
......@@ -750,12 +962,13 @@ export default {
this.allQty = 0;
this.tableLoading = true;
this.dataInfo();
if(val === 0){
if (val === 0) {
this.formData.limitStart = 1;
this.limitStart = 1;
this.page = 1;
}
findCargoData(this.formData).then((res) => {
findCargoData(this.formData)
.then((res) => {
if (res.code == 200) {
this.tableData = res.data.list;
this.totalCount = res.data.totalCount;
......@@ -776,97 +989,146 @@ export default {
});
}
this.tableLoading = false;
}).catch(()=>{
})
.catch(() => {
this.tableLoading = false;
});
this.$refs.newTables.clearTable();
this.cargoTotal();
},
//释放仓位
release(){
let idList = []
this.selectTable.map(item => {
item.msg = ''
idList.push(item.id)
})
releaseCargo(idList).then(res=>{
if(res.code === 200){
this.$message({
message: res.msg,
type: "success",
});
}else if(res.code === 201){
this.selectTable.map(item => {
res.data['success'].map(val=>{
val === item.id ? item.msg = item.msg+'操作成功,正在释放中。' : ''
})
res.data['accsPoolFlase'].map(val=>{
val === item.id ? item.msg = item.msg+'accs pool状态不正确。' : ''
})
res.data['existReleasing'].map(val=>{
val === item.id ? item.msg = item.msg+'已经在释放，请勿重复释放。' : ''
})
res.data['noFlight'].map(val=>{
val === item.id ? item.msg = item.msg+'无配载航班。' : ''
})
})
this.dialogVisible = true
}else{
this.$message({
message: res.msg,
type: "warning",
});
}
}).catch(err=>{
console.log(err)
})
},
//关闭弹窗
close(){
this.dialogVisible = false
this.selectTable = []
this.select()
},
//数据初始化
dataInfo(){
if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
dataInfo() {
if (
this.formData.customsReceiptStatusId != null &&
this.formData.customsReceiptStatusId.length < 1
) {
this.formData.customsReceiptStatusId = null;
}
if (this.createDate != null && this.createDate.length > 0) {
this.formData.createTimeStart = this.createDate[0];
this.formData.createTimeEnd = this.createDate[1];
}else{
} else {
this.formData.createTimeStart = null;
this.formData.createTimeEnd = null;
}
if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
}else{
this.formData.prematchFltDateStart ="";
} else {
this.formData.prematchFltDateStart = "";
this.formData.prematchFltDateEnd = "";
}
if (this.flightTime != null && this.flightTime.length > 0) {
this.formData.fltDateStart = this.flightTime[0];
this.formData.fltDateEnd = this.flightTime[1];
}else{
} else {
this.formData.fltDateStart = "";
this.formData.fltDateEnd = "";
}
if(this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0){
if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) {
this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
}else{
} else {
this.formData.cargoPlaneStart = null;
this.formData.cargoPlaneEnd = null;
}
if(this.formData.waybillNo){
if (this.formData.waybillNo) {
this.formData.waybillNo = this.formData.waybillNo.trim();
}
this.formData.limitStart = this.limitStart;
this.formData.limitSize = 100;
},
//总和
cargoTotal(){
cargoTotal() {
this.allWeight = 0;
this.allQty = 0;
if(this.selectTable.length > 0){
this.selectTable.forEach(item=>{
if (this.selectTable.length > 0) {
this.selectTable.forEach((item) => {
this.allWeight = this.allWeight + item.actualWeight;
this.allQty = this.allQty + item.qty;
})
});
this.allWeight = this.allWeight.toFixed(2);
this.allQty = this.allQty.toFixed();
}
},
//表格多选
tableSelect(val){
tableSelect(val) {
this.selectTable = val.selection;
this.cargoTotal();
},
//表格全选
tableSelectAll(val){
tableSelectAll(val) {
this.selectTable = val;
this.cargoTotal();
},
//分页
currentChange(val){
currentChange(val) {
this.formData.limitStart = val.start;
this.limitStart = val.start;
this.page = val.page;
this.select()
this.select();
},
//排序
sortChange(val){
let data = []
let nullData = []
this.tableData.forEach(item=>{
if(item[val.prop]){
data.push(item)
}else{
nullData.push(item)
}
})
data = data.sort(this.$refs.newTables.compare(val.prop,val.order))
if(val.order != "ascending"){
this.tableData = nullData.concat(data)
}else{
this.tableData = data.concat(nullData)
sortChange(val) {
let data = [];
let nullData = [];
this.tableData.forEach((item) => {
if (item[val.prop]) {
data.push(item);
} else {
nullData.push(item);
}
});
data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
if (val.order != "ascending") {
this.tableData = nullData.concat(data);
} else {
this.tableData = data.concat(nullData);
}
this.tableData.forEach((item, index = 0) => {
item.index = index;
......@@ -880,36 +1142,40 @@ export default {
xlse(page) {
this.progress = 1;
this.downLoadingTip.downloading = true;
let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
let cargoXlse = { title: "货物导出表", cargoConditionDto: {} };
this.dataInfo();
cargoXlse.cargoConditionDto = this.formData;
cargoXlse.cargoConditionDto.limitSize = this.limitSize;
if (page == 0) {
this.downLoadingTip.tip = "正在导出本页结果集"
this.downLoadingTip.tip = "正在导出本页结果集";
cargoXlse.cargoConditionDto.limitStart = this.limitStart;
downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.progress = 100;
}).catch(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
})
} else {
if(this.totalCount < 80000){
this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
cargoXlse.cargoConditionDto.limitStart = 0;
cargoXlse.cargoConditionDto.limitSize = -1;
downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
downLoadXlsx("/cargo/excel", cargoXlse, "货物表")
.then(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
this.downLoadingTip.tip = "";
this.progress = 100;
}).catch(()=>{
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = ""
})
}else{
.catch(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
});
} else {
if (this.totalCount < 80000) {
this.downLoadingTip.tip = "正在导出全部结果集请耐心等待";
cargoXlse.cargoConditionDto.limitStart = 0;
cargoXlse.cargoConditionDto.limitSize = -1;
downLoadXlsx("/cargo/excel", cargoXlse, "货物表")
.then(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
this.progress = 100;
})
.catch(() => {
this.downLoadingTip.downloading = false;
this.downLoadingTip.tip = "";
});
} else {
this.downLoadingTip.downloading = false;
this.$message({
message: "导出数据量过大，请不要超过8万条",
......@@ -918,6 +1184,7 @@ export default {
}
}
},
formatter(){}
},
computed: {
fltNo: {
......@@ -944,14 +1211,14 @@ export default {
this.formData.ursa = upCase(val);
},
},
cargoPlaneNo:{
cargoPlaneNo: {
get: function () {
return this.formData.cargoPlaneNo;
},
set: function (val) {
this.formData.cargoPlaneNo = upCase(val);
},
}
},
},
};
</script>
......@@ -964,19 +1231,19 @@ export default {
margin-top: 10px;
margin-left: 50px;
}
.progress{
width:200px;
.progress {
width: 200px;
display: inline-block;
margin:0 0 0 20px;
margin: 0 0 0 20px;
}
.formShow{
.formShow {
width: max-content;
height:48px;
height: 48px;
line-height: 48px;
font-weight: 900;
color: rgb(64, 158, 255);
font-size: 14px;
float: right;
margin-right:20px;
margin-right: 20px;
}
</style>
\ No newline at end of file
......
<template>
<div>
<el-form
ref="dmLogForm"
class="form-header"
:model="selectForm"
label-width="auto"
size="small"
:rules="rules"
>
<el-row type="flex" style="flex-wrap: wrap !important">
<el-col :span="6">
<el-form-item label="ACCS航班号">
<el-input
v-model.trim="fltNo"
class="formItem"
placeholder="请输入航班号"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建日期" prop="createTime">
<el-date-picker
v-model="selectForm.createTime"
class="formItem"
type="date"
placeholder="选择日期"
:value-format="valueFormat"
:clearable="false"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配舱结果">
<el-select
v-model="selectForm.status"
class="formItem"
placeholder="不限"
clearable
>
<el-option label="0-未处理" value="0"></el-option>
<el-option label="1-已处理" value="1"></el-option>
<el-option label="2-处理失败" value="2"></el-option>
<el-option label="3-无需处理" value="3"></el-option>
<el-option label="4-校验不通过" value="4"></el-option>
<el-option label="5-数据不能被多次处理" value="5"></el-option>
<el-option label="9-处理中" value="9"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班日期">
<el-date-picker
v-model="selectForm.fltDate"
class="formItem"
type="date"
placeholder="选择日期"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="口岸代码">
<el-select
v-model="selectForm.portName"
class="formItem"
placeholder="不限"
clearable
>
<el-option
v-for="item in portList"
:label="item.englishName"
:value="item.englishName"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div>
<el-button
type="primary"
size="small"
icon="el-icon-search"
:loading="loading"
:disabled="!selectForm.createTime"
@click="selectDMData(0)"
>查询</el-button
>
</div>
</el-form>
<Tables
ref="dmLogTables"
ductName="logDmData"
:data="data"
:headerData="tableHeader"
:infoShow="false"
:height="tableHeight"
:page="selectForm.page"
:pageSizes="[100]"
:totalCount="total"
:loading="loading"
@currentChange="currentChange"
@sortChange="sortChange"
>
<template v-slot:status="scope">
<el-tag
:type="
scope.row.status == 1
? 'success'
: scope.row.status == 2
? 'danger'
: scope.row.status == 3
? 'warning'
: scope.row.status == 4
? 'warning'
: scope.row.status == 5
? 'warning'
: ''
"
><span>{{ statusData(scope.row.status) }}</span></el-tag
>
</template>
</Tables>
</div>
</template>
<script>
import dictLabels from "../../../assets/languages/dictLabels.js";
import { portNameList } from "@/api/system/user.js";
import { getDmDataList } from "@/api/system/logConfig.js";
import { upCase } from "@/utils/FedEx";
export default {
name: "DmLog",
data() {
return {
selectForm: {
fltNo: undefined,
createTime: undefined,
page: 1,
size: 100,
},
data: [],
tableHeader: [
{
name: "配舱结果",
value: "status",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
slot: true,
},
{
name: "处理结果",
value: "processResult",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "异常代码",
value: "exceptionCode",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "运单ID",
value: "accsId",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "运单号",
value: "awbNbr",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "口岸代码",
value: "routeDest",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "ACCS航班号",
value: "flightNbr",
width: "130",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "ACCS航班日期",
value: "flightDate",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "ACCS航线",
value: "flightRoute",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "ACCS Pool",
value: "accsPool",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "消息代码",
value: "messageCode",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "消息发送时间",
value: "sendTime",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "消息落地时间",
value: "createTime",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "总单号",
value: "mawb",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "运单类型",
value: "classification",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "报关方式",
value: "portName",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "总件数",
value: "totalPcs",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "总重量",
value: "weight",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "取件日期",
value: "pickUpDate",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "URSA",
value: "ursa",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "海关回执代码",
value: "ent",
width: "130",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "Handing Code",
value: "handlingCode",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "subCategory",
value: "subCategory",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "intercept Code",
value: "interceptCode",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "ACCS发送时间",
value: "accsSendTime",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "品名描述",
value: "description",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "PUPOrPUX",
value: "pupOrPux",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "始发地站点",
value: "originLocationCode",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled: true,
},
{
name: "始发地城市名称",
value: "originCity",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "收件人国家代码",
value: "consigneeCountry",
width: "140",
align: "center",
sorTable: false,
fixed: false,
disabled: true,
},
{
name: "服务类型名称",
value: "serviceCode",
width: "130",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "货物ID",
value: "portName",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "是否RDE手动录入",
value: "manualRde",
width: "160",
align: "center",
sorTable: false,
fixed: false,
disabled: true,
},
{
name: "发件人账号",
value: "shipperAccount",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled: true,
},
{
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "修改时间",
value: "updateTime",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled: true,
},
{
name: "消息发送程序ID",
value: "senderId",
width: "140",
align: "center",
sorTable: false,
fixed: false,
disabled: true,
},
{
name: "消息接收程序ID",
value: "receiverId",
width: "140",
align: "center",
sorTable: false,
fixed: false,
disabled: true,
},
],
portList: [],
rules: {
createTime: [
{
required: true,
message: "创建日期不能为空",
trigger: "blur",
},
],
},
total: 0,
tableHeight: null,
loading: false,
valueFormat: "yyyy-MM-dd",
};
},
created() {
this.nowDate();
portNameList().then((res) => {
if (res.code === 200) {
this.portList = res.data;
} else {
this.$message({
message: "查询条件" + res.msg,
type: "warning",
});
}
});
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.selectDMData();
}
},
activated() {
this.selectDMData();
},
deactivated() {
this.data = [];
},
mounted() {
this.tableHeight =
window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 150;
},
methods: {
//当前日期格式化
nowDate() {
let date = new Date();
this.selectForm.createTime = `${date.getFullYear()}-${
(date.getMonth() + 1).length > 1
? date.getMonth() + 1
: "0" + (date.getMonth() + 1)
}-${date.getDate()}`;
},
//数据查询
selectDMData(val) {
this.data = [];
this.loading = true;
if (val === 0) {
this.selectForm.page = 1;
}
if (this.selectForm.createTime) {
getDmDataList(this.selectForm).then((res) => {
this.loading = false;
if (res.code === 200) {
if (res.data.total === 0) {
this.$message({
message: "未查询到数据",
type: "warning",
});
} else {
this.data = res.data.list;
this.total = res.data.total;
}
} else {
this.$message({
message: res.msg,
type: "warning",
});
}
});
} else {
this.loading = false;
this.$message({
message: "创建日期不能为空",
type: "warning",
});
}
},
//分页
currentChange(val) {
this.selectForm.page = val.page;
this.selectDMData();
},
//数据处理
statusData(val) {
if (dictLabels["logDmData"]["status"][val]) {
return dictLabels["logDmData"]["status"][val];
} else {
return val;
}
},
//排序
sortChange(val) {
let data = [];
let nullData = [];
this.data.forEach((item) => {
if (item[val.prop]) {
data.push(item);
} else {
nullData.push(item);
}
});
data = data.sort(this.$refs.dmLogTables.compare(val.prop, val.order));
if (val.order != "ascending") {
this.data = nullData.concat(data);
} else {
this.data = data.concat(nullData);
}
this.data.forEach((item, index = 0) => {
item.index = index;
});
},
},
computed: {
fltNo: {
get: function () {
return this.selectForm.fltNo;
},
set: function (val) {
this.selectForm.fltNo = upCase(val);
},
},
},
};
</script>
<style>
</style>
\ No newline at end of file
......@@ -18,7 +18,7 @@ module.exports = {
// 部署生产环境和开发环境下的URL。
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.FedEx.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.FedEx.vip/admin/，则设置 baseUrl 为 /admin/。
publicPath: process.env.NODE_ENV === "production" ? "/iMac/" : "/",
publicPath: process.env.NODE_ENV === "production" ? "/test/" : "/",
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
......