Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
47ca460d 1 parent 1d7e22ef

代码更新

Inline Side-by-side
Showing 13 changed files with 1269 additions and 929 deletions
let tableHeaders = {
//货物查询
"cargo": [
{
name: "口岸代码",
value: "portName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "取件日期",
value: "pickUpDate",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "取件扫描号",
value: "pickUpScanNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "站点",
value: "siteName",
width: "80",
align: "center",
sorTable: true,
status: 1
},
{
name: "运单号",
value: "waybillNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "总单号",
value: "totalWaybillNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "服务类型",
value: "serviceTypeName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "服务代码",
value: "serviceCode",
width: "100",
align: "center",
sorTable: false,
status: 1
},
{
name: "URSA",
value: "ursa",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "推送状态",
value: "cargoPushStatus",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "配舱状态",
value: "flightIdImac",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "释放状态",
value: "releasing",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "申报类型",
value: "typeName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCSpool",
value: "accsPool",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "HandlingCode",
value: "handingCode",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "subcategory",
value: "subCategory",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "件数",
value: "qty",
width: "80",
align: "center",
sorTable: true,
status: 1
},
{
name: "实际重量",
value: "actualWeight",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "收件人国家代码",
value: "consigneeCountry",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "品名描述",
value: "nameDescription",
width: "100",
align: "center",
sorTable: false,
status: 1
},
{
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "预审状态",
value: "preQualificationStatus",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "航班预审意见",
value: "caPretrialOpinion",
width: "120",
align: "center",
sorTable: false,
status: 1
},
{
name: "货物状态",
value: "statusName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "终配航班号",
value: "finalFlightNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "终配航班日期",
value: "finalFlightTime",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "二配航班号",
value: "twoMatchFlightNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "二配航班日期",
value: "twoMatchFlightTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "预配航班号",
value: "preplanFlightNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "预配航班日期",
value: "preplanFlightTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCS原航线",
value: "accsFlightRoute",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "是否RDE手工录入",
value: "manualRde",
width: "170",
align: "center",
sorTable: true,
status: 1
},
{
name: "是否自动",
value: "cargoRulesStatus",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "发件人账号",
value: "shipperAccount",
width: "120",
align: "center",
status: 1
},
{
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
align: "center",
status: 1
},
{
name: "始发地城市名称",
value: "originCity",
width: "130",
align: "center",
sorTable: false,
status: 1
},
{
name: "收件地",
value: "destinationSiteName",
width: "90",
align: "center",
status: 1
},
{
name: "尺寸",
value: "sizeStr",
width: "80",
align: "center",
sorTable: true,
status: 1
},
{
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "200",
align: "center",
status: 1
},
{
name: "大货预审时间",
value: "bigPretrialTime",
width: "120",
align: "center",
status: 1
},
{
name: "海关回执时间",
value: "customsReceiptTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "航班预审时间",
value: "caPretrialTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "创建人",
value: "createUserName",
width: "90",
align: "center",
sorTable: true,
status: 1
},
{
name: "创建时间",
value: "createTime",
width: "100",
align: "center",
sorTable: true,
status: 1
},
],
//航班信息维护
"FlightInformation": [
{
name: "航班日期",
value: "fltDate",
width: "100",
align: "center",
status: 1
},
{
name: "航班起飞时间",
value: "takeOffTime",
width: "120",
align: "center",
status: 1
},
{
name: "Pre-MDE CutOff时间",
value: "cutOffTime",
width: "150",
align: "center",
status: 1
},
{
name: "航班号",
value: "fltNo",
width: "100",
align: "center",
status: 1
},
{
name: "航班路线",
value: "route",
width: "140",
align: "center",
status: 1
},
{
name: "航班类型",
value: "typeName",
width: "100",
align: "center",
status: 1
},
{
name: "航班种类",
value: "flightKindName",
width: "100",
align: "center",
status: 1
},
{
name: "航班状态",
value: "statusName",
width: "100",
align: "center",
status: 1
},
{
name: "是否自动推送",
value: "pushDateSwitch",
width: "120",
align: "center",
status: 1
},
{
name: "总重量",
value: "totalWeight",
width: "90",
align: "center",
status: 1
},
{
name: "原始重量（KG）",
value: "originalWeight",
width: "120",
align: "center",
status: 1
},
{
name: "已配重量",
value: "alloctedWeight",
width: "90",
align: "center",
status: 1
},
{
name: "总体积(cm³)",
value: "totalVolume",
width: "100",
align: "center",
status: 1
},
{
name: "已配体积(cm³)",
value: "alloctedVolume",
width: "120",
align: "center",
status: 1
},
{
name: "是否需要预审",
value: "needRequired",
width: "130",
align: "center",
status: 1
},
{
name: "是否开启高低价",
value: "highLowPriceFlg",
width: "140",
align: "center",
status: 1
},
{
name: "是否限制一票一件",
value: "ticketToPiece",
width: "140",
align: "center",
status: 1
},
{
name: "额外增重百分比",
value: "extraWeightPercent",
width: "140",
align: "center",
status: 1
},
{
name: "高价百分比",
value: "highPriceWeightPercent",
width: "120",
align: "center",
status: 1
},
{
name: "低价百分比",
value: "lowPriceWeightPercent",
width: "120",
align: "center",
status: 1
},
{
name: "航班优先级",
value: "priorityName",
width: "100",
align: "center",
status: 1
},
{
name: "配舱优先级",
value: "priorityRuleName",
width: "100",
align: "center",
status: 1
},
{
name: "创建人",
value: "createUserName",
width: "90",
align: "center",
status: 1
},
{
name: "创建时间",
value: "createTime",
width: "100",
align: "center",
status: 1
},
{
name: "最后修改人",
value: "lastModifyUserName",
width: "120",
align: "center",
status: 1
},
{
name: "最后修改时间",
value: "lastModifyTime",
width: "120",
align: "center",
status: 1
},
],
//手动配舱
"cargoAllocation": [
{
name: "口岸代码",
value: "portName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "取件日期",
value: "pickUpDate",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "取件扫描号",
value: "pickUpScanNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "站点",
value: "siteName",
width: "80",
align: "center",
sorTable: true,
status: 1
},
{
name: "运单号",
value: "waybillNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "总单号",
value: "totalWaybillNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "服务类型",
value: "serviceTypeName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "服务代码",
value: "serviceCode",
width: "100",
align: "center",
sorTable: false,
status: 1
},
{
name: "URSA",
value: "ursa",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "申报类型",
value: "typeName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "HandlingCode",
value: "handingCode",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "subcategory",
value: "subCategory",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "件数",
value: "qty",
width: "80",
align: "center",
sorTable: true,
status: 1
},
{
name: "实际重量",
value: "actualWeight",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "收件人国家代码",
value: "consigneeCountry",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "品名描述",
value: "nameDescription",
width: "100",
align: "center",
sorTable: false,
status: 1
},
{
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "预审状态",
value: "preQualificationStatus",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "航班预审意见",
value: "caPretrialOpinion",
width: "120",
align: "center",
status: 1
},
{
name: "货物状态",
value: "statusName",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "终配航班号",
value: "finalFlightNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "终配航班日期",
value: "finalFlightTime",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "二配航班号",
value: "twoMatchFlightNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "二配航班日期",
value: "twoMatchFlightTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "预配航班号",
value: "preplanFlightNo",
width: "120",
align: "center",
sorTable: true,
status: 1
},
{
name: "预配航班日期",
value: "preplanFlightTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "ACCS原航线",
value: "accsFlightRoute",
width: "140",
align: "center",
sorTable: true,
status: 1
},
{
name: "是否RDE手工录入",
value: "manualRde",
width: "170",
align: "center",
sorTable: true,
status: 1
},
{
name: "是否自动",
value: "cargoRulesStatus",
width: "100",
align: "center",
sorTable: true,
status: 1
},
{
name: "发件人账号",
value: "shipperAccount",
width: "120",
align: "center",
status: 1
},
{
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
align: "center",
status: 1
},
{
name: "始发地城市名称",
value: "originCity",
width: "130",
align: "center",
status: 1
},
{
name: "收件地",
value: "destinationSiteName",
width: "90",
align: "center",
status: 1
},
{
name: "尺寸",
value: "sizeStr",
width: "80",
align: "center",
sorTable: true,
status: 1
},
{
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "250",
align: "center",
status: 1
},
{
name: "大货预审时间",
value: "bigPretrialTime",
width: "120",
align: "center",
status: 1
},
{
name: "海关回执时间",
value: "customsReceiptTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "航班预审时间",
value: "caPretrialTime",
width: "150",
align: "center",
sorTable: true,
status: 1
},
{
name: "创建人",
value: "createUserName",
width: "90",
align: "center",
sorTable: true,
status: 1
},
{
name: "创建时间",
value: "createTime",
width: "100",
align: "center",
sorTable: true,
status: 1
},
],
//角色设置
"role": [
{
name: "角色名称",
value: "name",
width: "150px",
align: "center",
status: 1
},
{
name: "角色状态",
value: "valid",
width: "150px",
align: "center",
status: 1
},
{
name: "创建人",
value: "createUserName",
width: "150px",
align: "center",
status: 1
},
{
name: "创建时间",
value: "createTime",
width: "150px",
align: "center",
status: 1
},
{
name: "修改时间",
value: "updateTime",
width: "150px",
align: "center",
status: 1
},
{
name: "备注",
value: "remark",
width: "400px",
align: "center",
status: 1
},
],
//用户设置
"user": [
{
name: "员工号",
value: "loginName",
width: "150px",
align: "center",
status: 1
},
{
name: "用户姓名",
value: "username",
width: "150px",
align: "center",
status: 1
},
{
name: "所属口岸",
value: "portName",
width: "150px",
align: "center",
status: 1
},
{
name: "所属角色",
value: "roleNames",
width: "150px",
align: "center",
status: 1
},
{
name: "电子邮箱",
value: "email",
width: "150px",
align: "center",
status: 1
},
{
name: "用户状态",
value: "isValid",
width: "100px",
align: "center",
status: 1
},
{
name: "修改时间",
value: "updateTime",
width: "150px",
align: "center",
status: 1
},
{
name: "备注",
value: "remark",
width: "150px",
align: "center",
status: 1
},
],
"DM": [
{
name: "DMaccsId",
value: "dmAccsId",
width: "",
align: "center",
status: 1
},
{
name: "创建时间",
value: "dmCreateTime",
width: "",
align: "center",
status: 1
},
{
name: "落地时间",
value: "dmSendTime",
width: "",
align: "center",
status: 1
},
{
name: "航班号",
value: "dmFlightNbr",
width: "",
align: "center",
status: 1
},
{
name: "航班日期",
value: "dmFlightDate",
width: "",
align: "center",
status: 1
},
{
name: "货物创建时间",
value: "cargoCreateTime",
width: "",
align: "center",
status: 1
},
{
name: "推送状态",
value: "cargoAllocationDataStatus",
width: "",
align: "center",
status: 1
},
{
name: "ACCS航线",
value: "flightFltDate",
width: "",
align: "center",
status: 1
},
{
name: "ACCS Pool",
value: "flightFltNo",
width: "",
align: "center",
status: 1
},
{
name: "消息代码",
value: "sendLogSendTime",
width: "",
align: "center",
status: 1
},
{
name: "消息发送时间",
value: "sendLogSendResult",
width: "",
align: "center",
status: 1
},
],
"dict": [
{
name: "数据名称",
value: "chineseName",
width: "",
align: "center",
status: 1
},
{
name: "字典CODE",
value: "code",
width: "",
align: "center",
status: 1
},
{
name: "描述",
value: "description",
width: "",
align: "center",
status: 1
}
],
"dictServiceCode": [
{
name: "",
value: "serviceCodeMapperList",
width: "",
align: "center",
expand: true,
status: 1
},
{
name: "数据名称",
value: "chineseName",
width: "",
align: "center",
status: 1
},
{
name: "字典CODE",
value: "code",
width: "",
align: "center",
status: 1
},
{
name: "描述",
value: "description",
width: "",
align: "center",
status: 1
}
],
"dictServiceCodeChildren": [
{
name: "数据名称",
value: "serviceCodeValue",
width: "",
align: "center",
status: 1
},
]
}
export default tableHeaders;
\ No newline at end of file
......@@ -8,6 +8,10 @@
width: 100% !important;
}
.wid95 {
width: 95% !important;
}
.wid90 {
width: 90% !important;
}
......@@ -80,9 +84,9 @@
margin-left: 20px;
}
// .el-dialog:not(.is-fullscreen) {
// margin-top: 6vh !important;
// }
// .el-dialog:not(.is-fullscreen) {
// margin-top: 6vh !important;
// }
.el-table {
......@@ -108,13 +112,13 @@
.form-header {
font-size: 15px;
color: #6379bb;
border-bottom: 1px solid #ddd;
// border-bottom: 1px solid #ddd;
margin: 8px 10px 25px 10px;
padding-top: 15px;
padding-bottom: 5px;
.formItem {
width: 90%;
width: 95%;
// max-width: 300px;
}
}
......
......@@ -26,6 +26,10 @@ html {
height: 100%;
}
input {
background-color: #fff !important;
}
*,
*:before,
*:after {
......
......@@ -10,7 +10,7 @@
<el-table-column v-if="selection" type="selection" width="50" align="center" :fixed="true"></el-table-column>
<!-- 序号 -->
<el-table-column v-if="order" type="index" width="50" align="center" :index="indexAdd"></el-table-column>
<template v-for="(item, index) in headerData">
<template v-for="(item, index) in headerData" v-if="item.status == 1">
<!-- 自定义插槽 -->
<el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
:fixed="item.fixed ? item.fixed : false" :show-overflow-tooltip="showOverflowTooltip"
......@@ -27,7 +27,7 @@
:sortable="item.sorTable ? true : false" :column-key="index.toString()"
:show-overflow-tooltip="showOverflowTooltip" header-align="center"
:sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
:formatter="formatter" :key="index">
:formatter="formatter" :key="item.index">
<template slot-scope="scope">
<slot :name="item.value" :row="scope.row"></slot>
</template>
......@@ -37,7 +37,7 @@
:align="item.align" :fixed="item.fixed ? item.fixed : false" :sortable="item.sorTable ? true : false"
:column-key="index.toString()" :show-overflow-tooltip="showOverflowTooltip" header-align="center"
:sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
:formatter="formatter" :key="index">
:formatter="formatter" :key="item.id">
</el-table-column>
</template>
<slot name="optionColumn"></slot>
......@@ -312,7 +312,9 @@ export default {
}
}
}
if (row.index) {
selection = this.selectTable.sort(this.compare("index", "ascending"));
}
this.$emit("tableSelect", { selection, row });
},
//表格全选
......@@ -442,13 +444,18 @@ export default {
}
}
.cell {
min-width: 24px;
.thead-cell {
width: 100%;
padding: 0;
display: inline-flex;
flex-direction: column;
align-items: left;
overflow: initial;
&:before {
content: "";
position: absolute;
......@@ -457,6 +464,19 @@ export default {
bottom: 0;
right: 0;
}
div {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.caret-wrapper {
position: absolute;
top: -20%;
right: 3%;
}
}
&.w-table_moving {
......
......@@ -20,6 +20,7 @@ import Pagination from "@/components/Pagination";
// 自定义表格工具扩展
import RightToolbar from "@/components/RightToolbar"
import Table from "@/components/Table"
import tableHeaders from '@/assets/languages/tableHeaders'
// 全局方法挂载
Vue.prototype.parseTime = parseTime
......@@ -31,6 +32,7 @@ Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.upCase = upCase
Vue.prototype.nowDate = nowDate
Vue.prototype.tableHeaders = tableHeaders
Vue.prototype.msgSuccess = function (msg) {
this.$message({ showClose: true, message: msg, type: "success" });
......
......@@ -178,7 +178,6 @@ import Dialog from "./info.vue";
import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
import { allDictData } from "@/api/destinationFlight";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
export default {
name: "CargoAllocation",
......@@ -209,294 +208,7 @@ export default {
customsReceiptStatusId: null,
accsPool: "OSPR"
}, //查询数据
tableHeader: [
{
name: "口岸代码",
value: "portName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "取件日期",
value: "pickUpDate",
width: "120",
align: "center",
sorTable: true,
},
{
name: "取件扫描号",
value: "pickUpScanNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "站点",
value: "siteName",
width: "80",
align: "center",
sorTable: true,
},
{
name: "运单号",
value: "waybillNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "总单号",
value: "totalWaybillNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "服务类型",
value: "serviceTypeName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "服务代码",
value: "serviceCode",
width: "100",
align: "center",
},
{
name: "URSA",
value: "ursa",
width: "100",
align: "center",
sorTable: true,
},
{
name: "申报类型",
value: "typeName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "HandlingCode",
value: "handingCode",
width: "150",
align: "center",
sorTable: true,
},
{
name: "subcategory",
value: "subCategory",
width: "140",
align: "center",
sorTable: true,
},
{
name: "件数",
value: "qty",
width: "80",
align: "center",
sorTable: true,
},
{
name: "实际重量",
value: "actualWeight",
width: "100",
align: "center",
sorTable: true,
},
{
name: "收件人国家代码",
value: "consigneeCountry",
width: "150",
align: "center",
sorTable: true,
},
{
name: "品名描述",
value: "nameDescription",
width: "100",
align: "center",
},
{
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "140",
align: "center",
sorTable: true,
},
{
name: "预审状态",
value: "preQualificationStatus",
width: "100",
align: "center",
sorTable: true,
},
{
name: "航班预审意见",
value: "caPretrialOpinion",
width: "120",
align: "center",
sorTable: false,
},
{
name: "货物状态",
value: "statusName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "终配航班号",
value: "finalFlightNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "终配航班日期",
value: "finalFlightTime",
width: "140",
align: "center",
sorTable: true,
},
{
name: "二配航班号",
value: "twoMatchFlightNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "二配航班日期",
value: "twoMatchFlightTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "预配航班号",
value: "preplanFlightNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "预配航班日期",
value: "preplanFlightTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
align: "center",
sorTable: true,
},
{
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "150",
align: "center",
sorTable: true,
},
{
name: "ACCS原航线",
value: "accsFlightRoute",
width: "140",
align: "center",
sorTable: true,
},
{
name: "是否RDE手工录入",
value: "manualRde",
width: "170",
align: "center",
sorTable: true,
},
{
name: "是否自动",
value: "cargoRulesStatus",
width: "100",
align: "center",
sorTable: true,
},
{
name: "发件人账号",
value: "shipperAccount",
width: "120",
align: "center",
},
{
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
align: "center",
},
{
name: "始发地城市名称",
value: "originCity",
width: "130",
align: "center",
},
{
name: "收件地",
value: "destinationSiteName",
width: "90",
align: "center",
},
{
name: "尺寸",
value: "sizeStr",
width: "80",
align: "center",
sorTable: true,
},
{
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "250",
align: "center",
},
{
name: "大货预审时间",
value: "bigPretrialTime",
width: "120",
align: "center",
},
{
name: "海关回执时间",
value: "customsReceiptTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "航班预审时间",
value: "caPretrialTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "创建人",
value: "createUserName",
width: "90",
align: "center",
sorTable: true,
},
{
name: "创建时间",
value: "createTime",
width: "100",
align: "center",
sorTable: true,
},
], //表头数据
tableHeader: this.tableHeaders['cargoAllocation'], //表头数据
tableData: [], //表格数据
tableSelection: [], //选中数据
selectData: {
......@@ -534,6 +246,7 @@ export default {
}
},
activated() {
this.seleData();
this.select();
},
deactivated() {
......@@ -577,7 +290,7 @@ export default {
.catch(() => { });
},
//查询
async select(val) {
select(val) {
this.loading = true;
this.dataInfo();
if (val === 0) {
......@@ -591,9 +304,6 @@ 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;
// });
} else {
this.msgWarning('未查询到数据')
}
......@@ -729,9 +439,6 @@ export default {
}
this.tableSelection = []
this.cargoTotal()
// this.tableData.forEach((item, index = 0) => {
// item.index = index;
// });
},
sizeChange(val) {
this.size = val
......@@ -758,7 +465,7 @@ export default {
return this.formData.fltNo;
},
set: function (val) {
this.formData.fltNo = upCase(val);
this.formData.fltNo = this.upCase(val);
},
},
ursa: {
......@@ -766,7 +473,7 @@ export default {
return this.ursaList;
},
set: function (val) {
this.ursaList = upCase(val);
this.ursaList = this.upCase(val);
},
},
siteName: {
......@@ -774,7 +481,7 @@ export default {
return this.siteNameList;
},
set: function (val) {
this.siteNameList = upCase(val);
this.siteNameList = this.upCase(val);
},
},
portName: {
......@@ -782,7 +489,7 @@ export default {
return this.formData.portName;
},
set: function (val) {
this.formData.portName = upCase(val);
this.formData.portName = this.upCase(val);
},
},
},
......
......@@ -44,7 +44,7 @@
</el-button>
<el-button type="text" size="mini" icon="el-icon-edit" v-hasPermi="['allocation:alloc:update']"
@click="handleClick(scope.row.id, 'update')">修改</el-button>
<el-button type="text" size="mini" icon="el-icon-delete" v-hasPermi="['allocation:alloc:delete']"
<el-button type="text" size="mini" icon="el-icon-delete" style="color:#ff4949" v-hasPermi="['allocation:alloc:delete']"
@click="del(scope.row.id, scope.row.status)">删除</el-button>
<el-button type="text" size="mini" icon="el-icon-video-pause" v-hasPermi="['allocation:alloc:openClose']"
@click="changeStatus(scope.row.id, 3)" v-if="scope.row.status == '1'">停用</el-button>
......
......@@ -48,7 +48,7 @@
<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, '删除')">
@click="handleDeleteorPlayorpause(scope.row, 0, '删除')" style="color:#ff4949">
删除</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, '启用')">启用
......
<template>
<div>
<el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto"
size="medium">
size="small">
<el-row>
<el-col :span="6">
<el-form-item label="航班日期从" prop="fltDateStart">
......@@ -64,10 +64,10 @@
</el-button>
</el-form>
<Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
:infoData="tableHeader" :order="true" :selection="true" :totalCount="total" :loading="loading"
:limitSize="queryParams.limitSize" :page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight"
:pageSizes="[20, 30, 40, 50, 100]" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
@currentChange="currentChange" @sortChange="sortChange" @sizeChange="sizeChange">
:order="true" :selection="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limitSize"
:page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]"
@tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange"
@sortChange="sortChange" @sizeChange="sizeChange">
<template slot="optionColumn">
<el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
class-name="small-padding fixed-width" fixed="right">
......@@ -79,8 +79,9 @@
</template>
</Tables>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
<el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true"
:show-close="false">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small">
<el-row>
<el-col :span="12">
<el-form-item label="航班号" prop="fltNo">
......@@ -99,7 +100,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="Pre-MDE CutOff时间" prop="cutOffTime">
<el-select class="wid80" v-model="form.cutOffTime" clearable placeholder="选择时间(可查找)" type="string"
<el-select class="wid80" v-model="form.cutOffTime" clearable placeholder="选择时间(输入查找选项)" type="string"
filterable>
<el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
</el-option>
......@@ -108,7 +109,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="航班路线" prop="route">
<el-input class="wid80" v-model="form.route" placeholder="请输入航班路线" />
<el-input class="wid80" v-model="form.route" placeholder="请输入航班路线（XXX-XXX字母大写）" />
</el-form-item>
</el-col>
</el-row>
......@@ -228,7 +229,7 @@
</div>
</el-dialog>
<el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false"
:append-to-body="true">
:append-to-body="true" :show-close="false">
<el-table :data="gridData">
<el-table-column property="fltNo" label="航班号"></el-table-column>
<el-table-column property="fltDate" label="航班日期"></el-table-column>
......@@ -298,168 +299,22 @@ export default {
trigger: "blur",
},
],
},
//原航班规则数据
findAllFltDatList: [],
//表头
tableHeader: [
{
name: "航班日期",
value: "fltDate",
width: "100",
align: "center",
},
{
name: "航班起飞时间",
value: "takeOffTime",
width: "120",
align: "center",
},
{
name: "Pre-MDE CutOff时间",
value: "cutOffTime",
width: "150",
align: "center",
},
{
name: "航班号",
value: "fltNo",
width: "100",
align: "center",
},
{
name: "航班路线",
value: "route",
width: "140",
align: "center",
},
{
name: "航班类型",
value: "typeName",
width: "100",
align: "center",
},
{
name: "航班种类",
value: "flightKindName",
width: "100",
align: "center",
},
{
name: "航班状态",
value: "statusName",
width: "100",
align: "center",
},
{
name: "是否自动推送",
value: "pushDateSwitch",
width: "120",
align: "center",
},
{
name: "总重量",
value: "totalWeight",
width: "90",
align: "center",
},
{
name: "原始重量（KG）",
value: "originalWeight",
width: "120",
align: "center",
},
{
name: "已配重量",
value: "alloctedWeight",
width: "90",
align: "center",
},
{
name: "总体积(cm³)",
value: "totalVolume",
width: "100",
align: "center",
},
{
name: "已配体积(cm³)",
value: "alloctedVolume",
width: "120",
align: "center",
},
{
name: "是否需要预审",
value: "needRequired",
width: "130",
align: "center",
},
{
name: "是否开启高低价",
value: "highLowPriceFlg",
width: "140",
align: "center",
},
{
name: "是否限制一票一件",
value: "ticketToPiece",
width: "140",
align: "center",
},
{
name: "额外增重百分比",
value: "extraWeightPercent",
width: "140",
align: "center",
},
{
name: "高价百分比",
value: "highPriceWeightPercent",
width: "120",
align: "center",
},
{
name: "低价百分比",
value: "lowPriceWeightPercent",
width: "120",
align: "center",
},
route: [
{
name: "航班优先级",
value: "priorityName",
width: "100",
align: "center",
},
{
name: "配舱优先级",
value: "priorityRuleName",
width: "100",
align: "center",
},
{
name: "创建人",
value: "createUserName",
width: "90",
align: "center",
},
{
name: "创建时间",
value: "createTime",
width: "100",
align: "center",
},
{
name: "最后修改人",
value: "lastModifyUserName",
width: "120",
align: "center",
required: true,
message: "航班线路不能为空",
trigger: "blur",
},
{
name: "最后修改时间",
value: "lastModifyTime",
width: "120",
align: "center",
pattern: /^([A-Z]{3,4})(\-[A-Z]{3,4})+$/,
message: "请输入正确得航班线路"
}
]
},
],
//原航班规则数据
findAllFltDatList: [],
//表头
tableHeader: this.tableHeaders['FlightInformation'],
//删除失败数据
gridData: [],
//form属性禁用状态
......@@ -566,12 +421,13 @@ export default {
created() {
//查询条件数据源
this.queryParams.fltDateStart = this.nowDate()
this.findFltConditionData();
if (this.$store.state.tagsView.cachedViews.length == 0) {
this.findFltConditionData();
this.findAllFltData();
}
},
activated() {
this.findFltConditionData();
this.findAllFltData();
},
deactivated() {
......@@ -599,7 +455,7 @@ export default {
this.form.fltNo != undefined &&
this.form.fltNo != ""
) {
this.form.fltNo = this.upCase(this.form.fltNo);
this.form.fltNo = this.form.fltNo.toUpperCase();
findFltCommonConf(this.form).then((response) => {
if (response.code == 200) {
//额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑
......@@ -697,7 +553,7 @@ export default {
this.queryParams.fltNo != undefined &&
this.queryParams.fltNo != ""
) {
this.queryParams.fltNo = this.upCase(this.queryParams.fltNo);
this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase();
}
findAllFltDataApi(this.queryParams).then((response) => {
this.loading = false;
......@@ -712,6 +568,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.findFltConditionData();
this.open = true;
this.title = "添加航班信息";
this.form.id = null;
......@@ -827,6 +684,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.findFltConditionData();
this.open = true;
this.title = "修改航班信息";
//航班号
......@@ -854,7 +712,6 @@ export default {
this.ids.forEach(item => {
fIds.push(item.id)
})
console.log(fIds)
this.$confirm("是否确认删除所选数据?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -939,6 +796,7 @@ export default {
cancel() {
this.open = false;
this.findAllFltData();
this.findFltConditionData();
this.reset();
},
/** 重置按钮操作 */
......@@ -1040,7 +898,20 @@ export default {
this.queryParams.limitSize = val;
this.findAllFltData();
},
setClose() {
this.tableHeader = this.tableHeaders['FlightInformation']
},
},
computed: {
route: {
get: function () {
return this.form.route;
},
set: function (val) {
this.form.route = this.upCase(val);
},
}
}
};
</script>
......
<template>
<div class="cargoPage">
<el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="medium"
<el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small"
:model="formData">
<el-row type="flex" style="flexWrap: wrap !important">
<el-col :span="6">
......@@ -18,7 +18,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="海关回执状态">
<el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
<el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple
clearable>
<el-option v-for="item in findConditionData.cargoCustomsReturnStatus" :label="item.chineseName"
:value="item.id" :key="item.id">
</el-option>
......@@ -149,16 +150,15 @@
<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 class="formShow">
<el-button class="mr20" icon="el-icon-search" size="mini" @click="formShow = !formShow" circle></el-button>
</div>
</div>
</el-form>
<Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :infoData="tableHeader"
:selection="true" :order="true" :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize"
:limitStart="limitStart" :page="page" :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight"
@sizeChange="sizeChange" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
@currentChange="currentChange" @sortChange="sortChange"></Tables>
<Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true"
:totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
:shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect"
@tableSelectAll="tableSelectAll" @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%">
......@@ -178,7 +178,6 @@
<script>
import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
export default {
name: "QueryCargo",
......@@ -213,322 +212,7 @@ export default {
limitStart: 1,
limitSize: 100,
}, //表单数据
tableHeader: [
{
name: "口岸代码",
value: "portName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "取件日期",
value: "pickUpDate",
width: "120",
align: "center",
sorTable: true,
},
{
name: "取件扫描号",
value: "pickUpScanNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "站点",
value: "siteName",
width: "80",
align: "center",
sorTable: true,
},
{
name: "运单号",
value: "waybillNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "总单号",
value: "totalWaybillNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "服务类型",
value: "serviceTypeName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "服务代码",
value: "serviceCode",
width: "100",
align: "center",
sorTable: false,
},
{
name: "URSA",
value: "ursa",
width: "100",
align: "center",
sorTable: true,
},
{
name: "推送状态",
value: "cargoAllocationDataStatus",
width: "100",
align: "center",
sorTable: true,
},
{
name: "配舱状态",
value: "flightIdImac",
width: "100",
align: "center",
sorTable: true,
},
{
name: "释放状态",
value: "releasing",
width: "100",
align: "center",
sorTable: true,
},
{
name: "申报类型",
value: "typeName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "ACCSpool",
value: "accsPool",
width: "120",
align: "center",
sorTable: true,
},
{
name: "HandlingCode",
value: "handingCode",
width: "150",
align: "center",
sorTable: true,
},
{
name: "subcategory",
value: "subCategory",
width: "140",
align: "center",
sorTable: true,
},
{
name: "件数",
value: "qty",
width: "80",
align: "center",
sorTable: true,
},
{
name: "实际重量",
value: "actualWeight",
width: "100",
align: "center",
sorTable: true,
},
{
name: "收件人国家代码",
value: "consigneeCountry",
width: "150",
align: "center",
sorTable: true,
},
{
name: "品名描述",
value: "nameDescription",
width: "100",
align: "center",
},
{
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "140",
align: "center",
sorTable: true,
},
{
name: "预审状态",
value: "preQualificationStatus",
width: "100",
align: "center",
sorTable: true,
},
{
name: "航班预审意见",
value: "caPretrialOpinion",
width: "120",
align: "center",
},
{
name: "货物状态",
value: "statusName",
width: "100",
align: "center",
sorTable: true,
},
{
name: "终配航班号",
value: "finalFlightNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "终配航班日期",
value: "finalFlightTime",
width: "140",
align: "center",
sorTable: true,
},
{
name: "二配航班号",
value: "twoMatchFlightNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "二配航班日期",
value: "twoMatchFlightTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "预配航班号",
value: "preplanFlightNo",
width: "120",
align: "center",
sorTable: true,
},
{
name: "预配航班日期",
value: "preplanFlightTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
align: "center",
sorTable: true,
},
{
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "150",
align: "center",
sorTable: true,
},
{
name: "ACCS原航线",
value: "accsFlightRoute",
width: "140",
align: "center",
sorTable: true,
},
{
name: "是否RDE手工录入",
value: "manualRde",
width: "170",
align: "center",
sorTable: true,
},
{
name: "是否自动",
value: "cargoRulesStatus",
width: "100",
align: "center",
sorTable: true,
},
{
name: "发件人账号",
value: "shipperAccount",
width: "120",
align: "center",
},
{
name: "发件公司中文名称",
value: "shipperCompany",
width: "150",
align: "center",
},
{
name: "始发地城市名称",
value: "originCity",
width: "130",
align: "center",
},
{
name: "收件地",
value: "destinationSiteName",
width: "90",
align: "center",
},
{
name: "尺寸",
value: "sizeStr",
width: "80",
align: "center",
sorTable: true,
},
{
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "250",
align: "center",
},
{
name: "大货预审时间",
value: "bigPretrialTime",
width: "120",
align: "center",
},
{
name: "海关回执时间",
value: "customsReceiptTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "航班预审时间",
value: "caPretrialTime",
width: "150",
align: "center",
sorTable: true,
},
{
name: "创建人",
value: "createUserName",
width: "90",
align: "center",
sorTable: true,
},
{
name: "创建时间",
value: "createTime",
width: "100",
align: "center",
sorTable: true,
},
], //表头数据
tableHeader: this.tableHeaders['cargo'], //表头数据
releaseHeader: [
{
name: "提示信息",
......@@ -606,18 +290,12 @@ export default {
};
},
created() {
// 查询条件
findConditionData().then((res) => {
if (res.code == 200) {
this.findConditionData = res.data;
} else {
this.msgWarning('查询条件不存在')
}
});
this.findCondition()
},
activated() {
if (this.$store.state.tagsView.cachedViews.length > 0) {
this.findCondition()
this.$store.state.tagsView.cachedViews.forEach(item => {
if (item === 'QueryCargo') {
this.totalCount > 0 ? this.select() : ''
......@@ -652,6 +330,16 @@ export default {
clear() {
this.$refs.cargoForm.resetFields();
},
// 查询条件
findCondition() {
findConditionData().then((res) => {
if (res.code == 200) {
this.findConditionData = res.data;
} else {
this.msgWarning('查询条件不存在')
}
});
},
//查询
select(val) {
this.tableData = [];
......@@ -712,7 +400,6 @@ export default {
val === item.id ? item.msg = item.msg + '已释放仓位。' : ''
})
res.data['pushFalse'].map(val => {
console.log(item)
val === item.id ? item.msg = item.msg + '该货物配舱结果已回推ACCS，不能释放。' : ''
})
})
......@@ -732,6 +419,9 @@ export default {
},
//数据初始化
dataInfo() {
if (this.formData.serviceTypeId != null && this.formData.serviceTypeId.length < 1) {
this.formData.serviceTypeId = null
}
if (
this.formData.customsReceiptStatusId != null &&
this.formData.customsReceiptStatusId.length < 1
......@@ -880,7 +570,7 @@ export default {
return this.formData.fltNo;
},
set: function (val) {
this.formData.fltNo = upCase(val);
this.formData.fltNo = this.upCase(val);
},
},
siteName: {
......@@ -888,7 +578,7 @@ export default {
return this.formData.siteName;
},
set: function (val) {
this.formData.siteName = upCase(val);
this.formData.siteName = this.upCase(val);
},
},
ursa: {
......@@ -896,7 +586,7 @@ export default {
return this.formData.ursa;
},
set: function (val) {
this.formData.ursa = upCase(val);
this.formData.ursa = this.upCase(val);
},
},
cargoPlaneNo: {
......@@ -904,7 +594,7 @@ export default {
return this.formData.cargoPlaneNo;
},
set: function (val) {
this.formData.cargoPlaneNo = upCase(val);
this.formData.cargoPlaneNo = this.upCase(val);
},
},
},
......@@ -934,6 +624,6 @@ export default {
color: rgb(64, 158, 255);
font-size: 14px;
float: right;
margin-right: 20px;
margin-right: 5px;
}
</style>
\ No newline at end of file
......
......@@ -30,9 +30,9 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']">新增角色
</el-button>
</div>
<Tables ductName="role" :data="data" :headerData="tableHeader" :infoData="tableHeader" :totalCount="total"
<Tables ref="role" ductName="role" :data="data" :headerData="tableHeader" :totalCount="total"
:limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
height="600" @sizeChange="sizeChange" @currentChange="currentChange">
:height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange">
<template slot="optionColumn">
<el-table-column header-align="center" align="center" label="操作">
<template slot-scope="scope">
......@@ -77,44 +77,7 @@ export default {
name: null,
}, //查询条件
data: [], //表格数据
tableHeader: [
{
name: "角色名称",
value: "name",
width: "150px",
align: "center",
},
{
name: "角色状态",
value: "valid",
width: "150px",
align: "center",
},
{
name: "创建人",
value: "createUserName",
width: "150px",
align: "center",
},
{
name: "创建时间",
value: "createTime",
width: "150px",
align: "center",
},
{
name: "修改时间",
value: "updateTime",
width: "150px",
align: "center",
},
{
name: "备注",
value: "remark",
width: "400px",
align: "center",
},
], //表头数据
tableHeader: this.tableHeaders['role'], //表头数据
roleData: {}, //角色详情
createTime: [],
drawer: false,
......@@ -122,6 +85,7 @@ export default {
roleFormDisabled: false,
tableLoading: false,
total: 0,
tableHeight: null
};
},
created() {
......@@ -129,6 +93,9 @@ export default {
this.selectRoleList();
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250
},
activated() {
this.selectRoleList();
},
......
......@@ -172,8 +172,6 @@ export default {
},
};
},
created() {
},
watch: {
drawer(val, oldVal) {
if (val) {
......@@ -229,7 +227,6 @@ export default {
console.log(err);
});
},
//关闭
handleClose() {
this.roleid = [];
......@@ -240,7 +237,6 @@ export default {
this.clearValidate('userForm')
this.$emit("handleClose", false);
},
//提交
submit() {
if (this.port.join(",").length > 0) {
......
......@@ -29,8 +29,8 @@
</el-button>
</div>
<Tables ductName="user" :data="data" :headerData="tableHeader" :limitSize="formData.size" :totalCount="total"
:loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" height="600" @sizeChange="sizeChange"
@currentChange="currentChange">
:loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight"
@sizeChange="sizeChange" @currentChange="currentChange">
<template slot="optionColumn">
<el-table-column header-align="center" align="center" width="auto" label="操作">
<template slot-scope="scope">
......@@ -88,7 +88,6 @@
<script>
import Drawer from "./drawer.vue";
import { listUser, detailUser, updateUserStatus } from "@/api/system/user.js";
export default {
name: "UserConfig",
components: {
......@@ -103,56 +102,7 @@ export default {
username: null,
phone: null,
}, //查询条件
tableHeader: [
{
name: "员工号",
value: "loginName",
width: "150px",
align: "center",
},
{
name: "用户姓名",
value: "username",
width: "150px",
align: "center",
},
{
name: "所属口岸",
value: "portName",
width: "150px",
align: "center",
},
{
name: "所属角色",
value: "roleNames",
width: "150px",
align: "center",
},
{
name: "电子邮箱",
value: "email",
width: "150px",
align: "center",
},
{
name: "用户状态",
value: "isValid",
width: "100px",
align: "center",
},
{
name: "修改时间",
value: "updateTime",
width: "150px",
align: "center",
},
{
name: "备注",
value: "remark",
width: "150px",
align: "center",
},
], //表头数据
tableHeader: this.tableHeaders['user'], //表头数据
userData: {}, //用户详情
data: [], //用户列表
drawer: false,
......@@ -161,6 +111,7 @@ export default {
drawerTitle: "",
total: 0,
loading: false,
tableHeight: null
};
},
created() {
......@@ -168,6 +119,9 @@ export default {
this.selectUser();
}
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250
},
activated() {
this.selectUser();
},
......@@ -197,7 +151,6 @@ export default {
console.log(err);
});
},
//用户详情
userDetail(id) {
detailUser(id)
......@@ -217,7 +170,6 @@ export default {
console.log(err);
});
},
//新增用户
addUser() {
this.userData = {};
......@@ -225,7 +177,6 @@ export default {
this.drawerTitle = "新增用户";
this.userFormDisabled = false;
},
//查询修改用户
buttonClick(row, status) {
this.userDetail(row.row.id);
......@@ -233,7 +184,6 @@ export default {
? (this.userFormDisabled = true)
: (this.userFormDisabled = false);
},
//修改用户状态
userStatus(row) {
let msg = "";
......@@ -261,9 +211,8 @@ export default {
.catch((err) => {
console.log(err);
})
.catch(() => { });
.catch(() => {});
},
//删除用户
removeUser(row) {
this.$confirm("是否要删除此用户", "提示", {
......@@ -284,20 +233,17 @@ export default {
.catch((err) => {
console.log(err);
})
.catch(() => []);
.catch(() => {});
},
handleClose(val) {
this.drawer = val;
this.userData = {};
this.selectUser();
},
currentChange(val) {
this.formData.page = val.page;
this.selectUser();
},
sizeChange(val) {
this.formData.size = val;
this.selectUser()
......