Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
f0858ccb 1 parent 15d89d14

字典更新

Inline Side-by-side
Showing 3 changed files with 68 additions and 58 deletions
let ductLabels = {
"cargoRulesStatus":{
"1":"手动",
"2":"自动"
let ductLabels = {
"cargoRulesStatus": {
"1": "手动",
"2": "自动"
},
"menuType": {
"M": "菜单",
......@@ -19,7 +19,20 @@
"isValid": {
"1": "开启",
"2": "关闭",
},
"ticketToPiece": {
"1": "是",
"0": "否",
},
"needRequired": {
"1": "是",
"0": "否",
},
"highLowPriceFlg": {
"1": "开启",
"0": "未开启",
}
}
export default ductLabels;
\ No newline at end of file
......
......@@ -19,6 +19,7 @@
end-placeholder="结束日期"
v-model="fltDate"
:value-format="valueFormat"
clearable
>
</el-date-picker>
</el-form-item>
......@@ -72,6 +73,32 @@
</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-input
class="formItem"
......@@ -79,6 +106,7 @@
placeholder="请输入运单号（回车分割）"
:autosize="true"
v-model="formData.waybillNo"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -126,6 +154,7 @@
placeholder="S_;P_;E2"
v-model="ursa"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -137,6 +166,7 @@
placeholder="PVG;PEK"
v-model="siteName"
:autosize="true"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -192,45 +222,19 @@
</el-row>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
<el-form-item label="航班类型">
<el-select
placeholder="不限"
v-model="formData.kindToAllocFlightId"
class="formItem"
clearable
>
<el-option
v-for="item in selectData.fltTypes"
:label="item.chineseName"
v-model="item.id"
:key="item.id"
>
</el-option>
</el-select>
</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>
</el-col>
<el-col :span="6">
<el-form-item label="口岸代码">
<el-input
v-model="portName"
placeholder="请输入口岸代码"
class="formItem"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="Handling Code">
<el-empty
......@@ -304,7 +308,7 @@
size="mini"
v-hasPermi="['allocation:cargo:allocation']"
@click="addFit"
:disabled="tableSelection.length <= 0"
:disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'"
>添加到航班</el-button
>
<div class="tips">
......@@ -323,6 +327,7 @@
:limitStart="formData.limitStart"
:page="page"
:shiftKey="shiftKey"
:infoShow="false"
:height="tableHeight"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
......@@ -341,7 +346,6 @@
import Dialog from "./info.vue";
import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
import { allDictData } from "@/api/destinationFlight";
// import { findFltConditionDataApi } from "@/api/findAllFltData";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
......@@ -372,6 +376,7 @@ export default {
handingCodes: null,
subCategorys: null,
customsReceiptStatusId: null,
accsPool:"OSPR"
}, //查询数据
tableHeader: [
{
......@@ -408,7 +413,7 @@ export default {
type: "",
name: "取件日期",
value: "pickUpDate",
width: "100",
width: "120",
align: "center",
sorTable: true,
fixed: false,
......@@ -854,9 +859,6 @@ export default {
activated(){
this.select();
},
deactivated(){
this.tableData = []
},
mounted() {
window.addEventListener("keydown", (code) => {
if (code.keyCode === 16 && code.shiftKey) {
......@@ -873,19 +875,6 @@ export default {
methods: {
//查询条件
async seleData() {
// findFltConditionDataApi()
// .then((res) => {
// if (res.code === 200) {
// this.selectData.fltTypes = res.data.flightType;
// }else{
// this.$message({
// message: "查询条件不存在",
// type: "warning",
// });
// }
// })
// .catch(() => {});
allDictData()
.then((res) => {
if (res.code === 200) {
......@@ -928,9 +917,9 @@ export default {
this.tableData = res.data.list;
this.totalCount = res.data.total;
if (res.data.list.length > 0) {
this.tableData.forEach((item, index = 0) => {
item.index = index;
});
// this.tableData.forEach((item, index = 0) => {
// item.index = index;
// });
} else {
this.$message({
message: "未查询到数据",
......@@ -1070,9 +1059,15 @@ export default {
} else{
this.tableData = data.concat(nullData);
}
this.tableData.forEach((item, index = 0) => {
item.index = index;
});
this.tableSelection = []
this.cargoTotal()
// this.tableData.forEach((item, index = 0) => {
// item.index = index;
// });
},
sizeChange(val){
this.size = val
this.select(0);
},
//添加到航班
addFit() {
......@@ -1123,6 +1118,9 @@ export default {
},
},
},
deactivated(){
this.tableData = []
},
};
</script>
......
......@@ -141,7 +141,6 @@
<el-col :span="6">
<el-form-item label="取件日期">
<el-date-picker
class="formItem"
v-model="formData.pickUpDate"
type="date"
placeholder="选择日期"
......