Showing
12 changed files
with
141 additions
and
229 deletions
src/api/et86.js
0 → 100644
| 1 | +import request from "@/utils/request"; | ||
| 2 | + | ||
| 3 | +// ET86查询 | ||
| 4 | +/** | ||
| 5 | + * @param createTimeStart; 开始时间 | ||
| 6 | + * @param createTimeEnd; 结束时间 | ||
| 7 | + * @param status; 1-有效 0-无效 不传查全部 | ||
| 8 | + */ | ||
| 9 | +export function findAllEtesRules(data) { | ||
| 10 | + return request({ | ||
| 11 | + url: "/etes/findAllEtesRules", | ||
| 12 | + method: "post", | ||
| 13 | + data: data, | ||
| 14 | + }); | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +// ET86新增 | ||
| 18 | +export function add(data) { | ||
| 19 | + return request({ | ||
| 20 | + url: "/etes/add", | ||
| 21 | + method: "post", | ||
| 22 | + data: data, | ||
| 23 | + }); | ||
| 24 | +} | ||
| 25 | + | ||
| 26 | +// ET86详情 | ||
| 27 | +export function findEtesRuleById(data) { | ||
| 28 | + return request({ | ||
| 29 | + url: "/etes/findEtesRuleById", | ||
| 30 | + method: "post", | ||
| 31 | + data: data, | ||
| 32 | + }); | ||
| 33 | +} | ||
| 34 | + | ||
| 35 | +// ET86编辑 | ||
| 36 | +export function update(data) { | ||
| 37 | + return request({ | ||
| 38 | + url: "/etes/udpate", | ||
| 39 | + method: "post", | ||
| 40 | + data: data, | ||
| 41 | + }); | ||
| 42 | +} |
| ... | @@ -114,6 +114,7 @@ | ... | @@ -114,6 +114,7 @@ |
| 114 | :style="{ width: item.width }" | 114 | :style="{ width: item.width }" |
| 115 | :disabled="item.disable" | 115 | :disabled="item.disable" |
| 116 | :placeholder="item.placeholder ? item.placeholder : '请选择日期'" | 116 | :placeholder="item.placeholder ? item.placeholder : '请选择日期'" |
| 117 | + :value-format="item.format" | ||
| 117 | clearable | 118 | clearable |
| 118 | > | 119 | > |
| 119 | </el-date-picker> | 120 | </el-date-picker> | ... | ... |
| ... | @@ -27,8 +27,8 @@ | ... | @@ -27,8 +27,8 @@ |
| 27 | :header-cell-class-name="headerCellClassName" | 27 | :header-cell-class-name="headerCellClassName" |
| 28 | > | 28 | > |
| 29 | <template v-if="columns.length"> | 29 | <template v-if="columns.length"> |
| 30 | - <template v-for="(item, index) in columns"> | 30 | + <template v-for="item in columns"> |
| 31 | - <column v-if="!item.hidden" :key="index" :attrs="item"></column> | 31 | + <column v-if="!item.hidden" :key="item.id" :attrs="item"></column> |
| 32 | </template> | 32 | </template> |
| 33 | </template> | 33 | </template> |
| 34 | <slot name="column" v-else></slot> | 34 | <slot name="column" v-else></slot> | ... | ... |
| ... | @@ -81,11 +81,25 @@ export const constantRoutes = [ | ... | @@ -81,11 +81,25 @@ export const constantRoutes = [ |
| 81 | children: [], | 81 | children: [], |
| 82 | }, | 82 | }, |
| 83 | { | 83 | { |
| 84 | - path: "/et86/:edit", | 84 | + path: "/et86/:name", |
| 85 | component: (resolve) => | 85 | component: (resolve) => |
| 86 | require(["@/views/allocationConfig/et86/edit"], resolve), | 86 | require(["@/views/allocationConfig/et86/edit"], resolve), |
| 87 | name: "edit", | 87 | name: "edit", |
| 88 | meta: { title: "编辑", icon: "user" }, | 88 | meta: { title: "编辑", icon: "user" }, |
| 89 | + beforeEnter: (to, from, next) => { | ||
| 90 | + const { params } = to; | ||
| 91 | + if (params.title == "edit") { | ||
| 92 | + to.params.title = "编辑" | ||
| 93 | + to.params.icon = "user"; | ||
| 94 | + }else if (params.title == "detail") { | ||
| 95 | + to.params.title = "详情"; | ||
| 96 | + to.params.icon = "user"; | ||
| 97 | + }else{ | ||
| 98 | + to.params.title = "新增"; | ||
| 99 | + to.params.icon = "user"; | ||
| 100 | + } | ||
| 101 | + next(); | ||
| 102 | + }, | ||
| 89 | }, | 103 | }, |
| 90 | { | 104 | { |
| 91 | path: "/info/:handle/id=:id;routeStatus=:routeStatus;fltNo=:fltNo;route=:route;fltDate=:fltDate;status=:status", | 105 | path: "/info/:handle/id=:id;routeStatus=:routeStatus;fltNo=:fltNo;route=:route;fltDate=:fltDate;status=:status", | ... | ... |
| ... | @@ -155,7 +155,7 @@ export const inputBlurValidate = { | ... | @@ -155,7 +155,7 @@ export const inputBlurValidate = { |
| 155 | // 报价值【申报价值可以为空为0】 | 155 | // 报价值【申报价值可以为空为0】 |
| 156 | validateCustomVal(value, customVal) { | 156 | validateCustomVal(value, customVal) { |
| 157 | if (value.length) { | 157 | if (value.length) { |
| 158 | - this.queryForm[customVal] = Number(value); | 158 | + this[customVal] = Number(value); |
| 159 | let coin = { | 159 | let coin = { |
| 160 | minCNYCustomVal: "minCNYCustomVal", | 160 | minCNYCustomVal: "minCNYCustomVal", |
| 161 | maxCNYCustomVal: "minCNYCustomVal", | 161 | maxCNYCustomVal: "minCNYCustomVal", |
| ... | @@ -170,20 +170,20 @@ export const inputBlurValidate = { | ... | @@ -170,20 +170,20 @@ export const inputBlurValidate = { |
| 170 | }; | 170 | }; |
| 171 | let markCoin = false; | 171 | let markCoin = false; |
| 172 | if (customVal == "minCNYCustomVal" || customVal == "maxCNYCustomVal") { | 172 | if (customVal == "minCNYCustomVal" || customVal == "maxCNYCustomVal") { |
| 173 | - if (this.queryForm.minCNYCustomVal && this.queryForm.maxCNYCustomVal) { | 173 | + if (this.minCNYCustomVal && this.maxCNYCustomVal) { |
| 174 | - markCoin = Number(this.queryForm.maxCNYCustomVal) < Number(this.queryForm.minCNYCustomVal); | 174 | + markCoin = Number(this.maxCNYCustomVal) < Number(this.minCNYCustomVal); |
| 175 | } | 175 | } |
| 176 | } else { | 176 | } else { |
| 177 | - if (this.queryForm.minSUDCustomVal && this.queryForm.maxSUDCustomVal) { | 177 | + if (this.minSUDCustomVal && this.maxSUDCustomVal) { |
| 178 | - markCoin = Number(this.queryForm.maxSUDCustomVal) < Number(this.queryForm.minSUDCustomVal); | 178 | + markCoin = Number(this.maxSUDCustomVal) < Number(this.minSUDCustomVal); |
| 179 | } | 179 | } |
| 180 | } | 180 | } |
| 181 | - if (/^(0|[1-9]\d*)(.\d{1,2})?$/.test(this.queryForm[customVal])) { | 181 | + if (/^(0|[1-9]\d*)(.\d{1,2})?$/.test(this[customVal])) { |
| 182 | - if (this.queryForm[customVal] >= 0) { | 182 | + if (this[customVal] >= 0) { |
| 183 | if (markCoin) { | 183 | if (markCoin) { |
| 184 | this.$refs[coin[customVal]].innerHTML = ""; | 184 | this.$refs[coin[customVal]].innerHTML = ""; |
| 185 | this.$refs[coin[customVal]].innerHTML = "最小申报价值不得大于最大申报价值"; | 185 | this.$refs[coin[customVal]].innerHTML = "最小申报价值不得大于最大申报价值"; |
| 186 | - } else if (this.queryForm[customVal] > currency[customVal]) { | 186 | + } else if (this[customVal] > currency[customVal]) { |
| 187 | this.$refs[coin[customVal]].innerHTML = ""; | 187 | this.$refs[coin[customVal]].innerHTML = ""; |
| 188 | this.$refs[coin[customVal]].innerHTML = `最大申报值不得大于${currency[customVal]}`; | 188 | this.$refs[coin[customVal]].innerHTML = `最大申报值不得大于${currency[customVal]}`; |
| 189 | } else { | 189 | } else { | ... | ... |
This diff is collapsed. Click to expand it.
| ... | @@ -10,7 +10,7 @@ export default { | ... | @@ -10,7 +10,7 @@ export default { |
| 10 | }, | 10 | }, |
| 11 | // 处理serviceCode包不包含 | 11 | // 处理serviceCode包不包含 |
| 12 | serviceCodeCofig() { | 12 | serviceCodeCofig() { |
| 13 | - let str = this.queryForm.serviceCode.replace(/;|;/g, ","); | 13 | + let str = this.serviceCode.replace(/;|;/g, ","); |
| 14 | let arr = str.split(","); | 14 | let arr = str.split(","); |
| 15 | if (arr[arr.length - 1] == "") { | 15 | if (arr[arr.length - 1] == "") { |
| 16 | arr.splice(arr.length - 1, 1); | 16 | arr.splice(arr.length - 1, 1); |
| ... | @@ -44,7 +44,7 @@ export default { | ... | @@ -44,7 +44,7 @@ export default { |
| 44 | }, | 44 | }, |
| 45 | // serviceCode失焦事件 | 45 | // serviceCode失焦事件 |
| 46 | serviceCodeBlur() { | 46 | serviceCodeBlur() { |
| 47 | - if (this.queryForm.isServiceCode == "1") { | 47 | + if (this.isServiceCode == "1") { |
| 48 | if (this.serviceCodeCofig().noInclude.length) { | 48 | if (this.serviceCodeCofig().noInclude.length) { |
| 49 | let tip = this.serviceCodeCofig().noInclude.toString(); | 49 | let tip = this.serviceCodeCofig().noInclude.toString(); |
| 50 | this.msgError(`${tip} 不包含`); | 50 | this.msgError(`${tip} 不包含`); | ... | ... |
| ... | @@ -22,32 +22,32 @@ export const tableAttr = { | ... | @@ -22,32 +22,32 @@ export const tableAttr = { |
| 22 | export const columnHeader = (deleteRow) => [ | 22 | export const columnHeader = (deleteRow) => [ |
| 23 | { | 23 | { |
| 24 | label: "航班号", | 24 | label: "航班号", |
| 25 | - prop: "fltNo", | 25 | + prop: "flightNo", |
| 26 | align: "center", | 26 | align: "center", |
| 27 | minWidth: 100, | 27 | minWidth: 100, |
| 28 | }, | 28 | }, |
| 29 | { | 29 | { |
| 30 | label: "航班日期", | 30 | label: "航班日期", |
| 31 | - prop: "fltNoDate", | 31 | + prop: "calculateDay", |
| 32 | align: "center", | 32 | align: "center", |
| 33 | minWidth: 100, | 33 | minWidth: 100, |
| 34 | // sortable: true, | 34 | // sortable: true, |
| 35 | // "sort-method": (a, b) => b.updateTime - a.updateTime, | 35 | // "sort-method": (a, b) => b.updateTime - a.updateTime, |
| 36 | }, | 36 | }, |
| 37 | { | 37 | { |
| 38 | - label: "航线优先级", | 38 | + label: "航线", |
| 39 | - prop: "fltRoute", | 39 | + prop: "flightRoute", |
| 40 | align: "center", | 40 | align: "center", |
| 41 | minWidth: 100, | 41 | minWidth: 100, |
| 42 | }, | 42 | }, |
| 43 | { | 43 | { |
| 44 | label: "爆仓是否继续配舱", | 44 | label: "爆仓是否继续配舱", |
| 45 | - prop: "isOn", | 45 | + prop: "permitOverweight", |
| 46 | align: "center", | 46 | align: "center", |
| 47 | minWidth: 100, | 47 | minWidth: 100, |
| 48 | render: (h, params) => { | 48 | render: (h, params) => { |
| 49 | const { row } = params; | 49 | const { row } = params; |
| 50 | - console.log(345678,row); | 50 | + console.log(345678, row); |
| 51 | // return h("div", `状态-${row.id}`); | 51 | // return h("div", `状态-${row.id}`); |
| 52 | }, | 52 | }, |
| 53 | }, | 53 | }, |
| ... | @@ -80,15 +80,3 @@ export const columnHeader = (deleteRow) => [ | ... | @@ -80,15 +80,3 @@ export const columnHeader = (deleteRow) => [ |
| 80 | }, | 80 | }, |
| 81 | }, | 81 | }, |
| 82 | ]; | 82 | ]; |
| 83 | - | ||
| 84 | -export const tableData = [ | ||
| 85 | - { | ||
| 86 | - id: "1", | ||
| 87 | - fltNo: "A380", | ||
| 88 | - fltNoDate: "3", | ||
| 89 | - fltRoute: "", | ||
| 90 | - routeList: [], | ||
| 91 | - isOn: "1", | ||
| 92 | - sort: "1", // 排序字段 | ||
| 93 | - }, | ||
| 94 | -]; | ... | ... |
| ... | @@ -6,7 +6,8 @@ export const formConfig = [ | ... | @@ -6,7 +6,8 @@ export const formConfig = [ |
| 6 | prop: "startTime", | 6 | prop: "startTime", |
| 7 | width: "140px", | 7 | width: "140px", |
| 8 | placeholder: "请选择开始时间", | 8 | placeholder: "请选择开始时间", |
| 9 | - rules: { required: true, message: "请选择开始时间", trigger: "blur" }, | 9 | + // rules: { required: true, message: "请选择开始时间", trigger: "blur" }, |
| 10 | + format: "yyyy-MM-dd", | ||
| 10 | }, | 11 | }, |
| 11 | { | 12 | { |
| 12 | label: "创建时间(到)", | 13 | label: "创建时间(到)", |
| ... | @@ -15,7 +16,8 @@ export const formConfig = [ | ... | @@ -15,7 +16,8 @@ export const formConfig = [ |
| 15 | prop: "endTime", | 16 | prop: "endTime", |
| 16 | width: "140px", | 17 | width: "140px", |
| 17 | placeholder: "请选择结束时间", | 18 | placeholder: "请选择结束时间", |
| 18 | - rules: { required: true, message: "请选择结束时间", trigger: "blur" }, | 19 | + // rules: { required: true, message: "请选择结束时间", trigger: "blur" }, |
| 20 | + format: "yyyy-MM-dd", | ||
| 19 | }, | 21 | }, |
| 20 | { | 22 | { |
| 21 | label: "规则状态", | 23 | label: "规则状态", |
| ... | @@ -31,7 +33,7 @@ export const formConfig = [ | ... | @@ -31,7 +33,7 @@ export const formConfig = [ |
| 31 | label: "有效", | 33 | label: "有效", |
| 32 | }, | 34 | }, |
| 33 | { | 35 | { |
| 34 | - value: "3", | 36 | + value: "0", |
| 35 | label: "无效", | 37 | label: "无效", |
| 36 | }, | 38 | }, |
| 37 | ], | 39 | ], | ... | ... |
| ... | @@ -6,8 +6,6 @@ | ... | @@ -6,8 +6,6 @@ |
| 6 | ref="ruleForm" | 6 | ref="ruleForm" |
| 7 | :formConfig="formConfig" | 7 | :formConfig="formConfig" |
| 8 | :queryForm="queryForm" | 8 | :queryForm="queryForm" |
| 9 | - @input="inputEvent" | ||
| 10 | - @keyup="keyUpEvent" | ||
| 11 | /> | 9 | /> |
| 12 | </el-col> | 10 | </el-col> |
| 13 | </el-row> | 11 | </el-row> |
| ... | @@ -30,12 +28,10 @@ | ... | @@ -30,12 +28,10 @@ |
| 30 | import YlForm from "@/components/YlForm"; | 28 | import YlForm from "@/components/YlForm"; |
| 31 | import YlTable from "@/components/YlTable"; | 29 | import YlTable from "@/components/YlTable"; |
| 32 | import { formConfig } from "./formConfig"; | 30 | import { formConfig } from "./formConfig"; |
| 33 | -import { debounce } from "@/utils"; | 31 | +import { tableAttr, columnHeader } from "./tableConfig"; |
| 34 | -import { tableAttr, columnHeader, tableData } from "./tableConfig"; | ||
| 35 | import { | 32 | import { |
| 36 | - allDictData, // 获取全部字典 | 33 | + findAllEtesRules, // ET86查询 |
| 37 | - queryRouteByFltNo, // 航线查询 | 34 | +} from "@/api/et86"; |
| 38 | -} from "@/api/destinationFlight"; | ||
| 39 | export default { | 35 | export default { |
| 40 | components: { | 36 | components: { |
| 41 | YlForm, | 37 | YlForm, |
| ... | @@ -44,14 +40,12 @@ export default { | ... | @@ -44,14 +40,12 @@ export default { |
| 44 | data() { | 40 | data() { |
| 45 | return { | 41 | return { |
| 46 | formConfig: formConfig, // 表单配置项 | 42 | formConfig: formConfig, // 表单配置项 |
| 47 | - queryForm: { | 43 | + queryForm: { // 表单参数 |
| 48 | - // 表单参数 | ||
| 49 | status: "有效", | 44 | status: "有效", |
| 50 | }, | 45 | }, |
| 51 | - pageConfig: { | 46 | + pageConfig: { // 分页配置项 |
| 52 | - // 分页配置项 | ||
| 53 | isPagination: true, | 47 | isPagination: true, |
| 54 | - total: 13, | 48 | + total: 0, |
| 55 | pageData: { | 49 | pageData: { |
| 56 | page: 1, | 50 | page: 1, |
| 57 | size: 10, | 51 | size: 10, |
| ... | @@ -59,71 +53,63 @@ export default { | ... | @@ -59,71 +53,63 @@ export default { |
| 59 | }, | 53 | }, |
| 60 | tableAttr: tableAttr, // table配置项 | 54 | tableAttr: tableAttr, // table配置项 |
| 61 | columns: columnHeader(this.viewRow, this.editRow, this.deleteRow), // 表头 | 55 | columns: columnHeader(this.viewRow, this.editRow, this.deleteRow), // 表头 |
| 62 | - tableData: tableData, // 表格数据 | 56 | + tableData: [], // 表格数据 |
| 63 | selectionList: [], // table复选框筛选集合 | 57 | selectionList: [], // table复选框筛选集合 |
| 64 | }; | 58 | }; |
| 65 | }, | 59 | }, |
| 66 | - created() {}, | 60 | + created() { |
| 61 | + // ET86查询 | ||
| 62 | + this.$nextTick(() => { | ||
| 63 | + this.searchBtn(); | ||
| 64 | + }); | ||
| 65 | + }, | ||
| 67 | mounted() {}, | 66 | mounted() {}, |
| 68 | methods: { | 67 | methods: { |
| 69 | - // 航线查询 | 68 | + // ET86查询 |
| 70 | - queryRoute(item) { | 69 | + queryFindAllEtesRules(params) { |
| 71 | - queryRouteByFltNo(item).then((res) => { | 70 | + this.tableAttr.loadingTable = true; |
| 72 | - if (res.code == 200) { | 71 | + findAllEtesRules(params) |
| 73 | - const list = res.data.list; | 72 | + .then((res) => { |
| 74 | - let routeList = ""; | 73 | + this.tableAttr.loadingTable = false; |
| 75 | - if (list.length) { | 74 | + const { code, data } = res; |
| 76 | - list.map((item) => { | 75 | + if (code == 200) { |
| 77 | - routeList += item.route + ","; | 76 | + this.tableData = data.list; |
| 78 | - }); | 77 | + this.pageConfig.total = data.total; |
| 79 | - this.queryForm.fltRoute = routeList.substring( | ||
| 80 | - 0, | ||
| 81 | - routeList.length - 1 | ||
| 82 | - ); | ||
| 83 | - } else { | ||
| 84 | - this.queryForm = { | ||
| 85 | - fltNo: item.fltNo, // 航班号 | ||
| 86 | - }; | ||
| 87 | } | 78 | } |
| 88 | - } | 79 | + }) |
| 89 | - }); | 80 | + .catch(() => {}); |
| 90 | - }, | ||
| 91 | - // input事件 | ||
| 92 | - inputEvent: debounce(function () { | ||
| 93 | - this.queryRoute({ | ||
| 94 | - fltNo: this.queryForm.fltNo, // 航班号 | ||
| 95 | - }); | ||
| 96 | - }, 800), | ||
| 97 | - // 回车事件 | ||
| 98 | - keyUpEvent(item) { | ||
| 99 | - this.queryRoute(item); | ||
| 100 | }, | 81 | }, |
| 101 | // table复选框事件 | 82 | // table复选框事件 |
| 102 | selectionTable(e) { | 83 | selectionTable(e) { |
| 103 | - console.log("selectionTable:", e); | ||
| 104 | this.selectionList = e; | 84 | this.selectionList = e; |
| 105 | }, | 85 | }, |
| 106 | //条数变化 | 86 | //条数变化 |
| 107 | handleSizeChange(e) { | 87 | handleSizeChange(e) { |
| 108 | this.pageConfig.pageData.size = e; | 88 | this.pageConfig.pageData.size = e; |
| 109 | this.pageConfig.pageData.page = 1; | 89 | this.pageConfig.pageData.page = 1; |
| 110 | - console.log("sizeChange:", e); | 90 | + this.searchBtn(); |
| 111 | }, | 91 | }, |
| 112 | //页码变化 | 92 | //页码变化 |
| 113 | handleCurrentChange(e) { | 93 | handleCurrentChange(e) { |
| 114 | this.pageConfig.pageData.page = e; | 94 | this.pageConfig.pageData.page = e; |
| 115 | - console.log("currentChange:", e); | 95 | + this.searchBtn(); |
| 116 | }, | 96 | }, |
| 117 | // 搜索 | 97 | // 搜索 |
| 118 | searchBtn(row) { | 98 | searchBtn(row) { |
| 119 | let params = { | 99 | let params = { |
| 120 | - ...this.queryForm, | 100 | + createTimeStart: this.queryForm.startTime |
| 101 | + ? this.queryForm.startTime | ||
| 102 | + : "", | ||
| 103 | + createTimeEnd: this.queryForm.endTime ? this.queryForm.endTime : "", | ||
| 104 | + limitStart: this.pageConfig.pageData.page, | ||
| 105 | + limitSize: this.pageConfig.pageData.size, | ||
| 106 | + status: this.queryForm.status, | ||
| 121 | }; | 107 | }; |
| 122 | if (this.queryForm.status == "有效") { | 108 | if (this.queryForm.status == "有效") { |
| 123 | - params.status = '1'; | 109 | + params.status = "1"; |
| 124 | } | 110 | } |
| 125 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { | 111 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { |
| 126 | - console.log(params); | 112 | + this.queryFindAllEtesRules(params); |
| 127 | }); | 113 | }); |
| 128 | }, | 114 | }, |
| 129 | // 重置表单 | 115 | // 重置表单 |
| ... | @@ -136,43 +122,43 @@ export default { | ... | @@ -136,43 +122,43 @@ export default { |
| 136 | this.$router.push({ | 122 | this.$router.push({ |
| 137 | name: "edit", | 123 | name: "edit", |
| 138 | params: { | 124 | params: { |
| 139 | - edit: 12, | 125 | + name: "add", |
| 126 | + }, | ||
| 127 | + }); | ||
| 128 | + }, | ||
| 129 | + // 查看 | ||
| 130 | + viewRow({ row }) { | ||
| 131 | + this.$router.push({ | ||
| 132 | + name: "edit", | ||
| 133 | + params: { | ||
| 134 | + name: "view", | ||
| 135 | + id: row.id, | ||
| 136 | + status: row.status | ||
| 140 | }, | 137 | }, |
| 141 | }); | 138 | }); |
| 139 | + console.log("查看:", row); | ||
| 142 | }, | 140 | }, |
| 143 | // 编辑 | 141 | // 编辑 |
| 144 | - editRow(item) { | 142 | + editRow({ row }) { |
| 145 | this.$router.push({ | 143 | this.$router.push({ |
| 146 | name: "edit", | 144 | name: "edit", |
| 147 | params: { | 145 | params: { |
| 148 | - edit: 12, | 146 | + name: "edit", |
| 147 | + id: row.id, | ||
| 149 | }, | 148 | }, |
| 150 | }); | 149 | }); |
| 151 | - console.log("修改:", item); | ||
| 152 | }, | 150 | }, |
| 153 | // 删除 | 151 | // 删除 |
| 154 | - deleteRow(item) { | 152 | + deleteRow({ row }) { |
| 155 | this.$confirm("是否确认删除?", "提示", { | 153 | this.$confirm("是否确认删除?", "提示", { |
| 156 | confirmButtonText: "确定", | 154 | confirmButtonText: "确定", |
| 157 | cancelButtonText: "取消", | 155 | cancelButtonText: "取消", |
| 158 | type: "warning", | 156 | type: "warning", |
| 159 | center: true, | 157 | center: true, |
| 160 | - }) | 158 | + }).then(() => { |
| 161 | - .then(() => { | 159 | + console.log("删除:", row); |
| 162 | - console.log("删除:", item); | ||
| 163 | this.msgSuccess("删除成功!"); | 160 | this.msgSuccess("删除成功!"); |
| 164 | - }) | 161 | + }).catch(() => {}); |
| 165 | - .catch(() => {}); | ||
| 166 | - }, | ||
| 167 | - // 查看 | ||
| 168 | - viewRow({ row }) { | ||
| 169 | - this.$router.push({ | ||
| 170 | - name: "edit", | ||
| 171 | - params: { | ||
| 172 | - edit: 12, | ||
| 173 | - }, | ||
| 174 | - }); | ||
| 175 | - console.log("查看:", row); | ||
| 176 | }, | 162 | }, |
| 177 | }, | 163 | }, |
| 178 | }; | 164 | }; | ... | ... |
| 1 | const state = { | 1 | const state = { |
| 2 | 1: "有效", | 2 | 1: "有效", |
| 3 | - 3: "无效", | 3 | + 0: "无效", |
| 4 | }; | 4 | }; |
| 5 | export const tableAttr = { | 5 | export const tableAttr = { |
| 6 | border: true, | 6 | border: true, |
| ... | @@ -56,13 +56,13 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -56,13 +56,13 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 56 | }, | 56 | }, |
| 57 | { | 57 | { |
| 58 | label: "原航班号", | 58 | label: "原航班号", |
| 59 | - prop: "fltNo", | 59 | + prop: "originOfFlightNo", |
| 60 | align: "center", | 60 | align: "center", |
| 61 | minWidth: 100, | 61 | minWidth: 100, |
| 62 | }, | 62 | }, |
| 63 | { | 63 | { |
| 64 | label: "顺位航班", | 64 | label: "顺位航班", |
| 65 | - prop: "flightRand", | 65 | + prop: "rankFltNoStr", |
| 66 | align: "center", | 66 | align: "center", |
| 67 | minWidth: 100, | 67 | minWidth: 100, |
| 68 | }, | 68 | }, |
| ... | @@ -177,114 +177,3 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -177,114 +177,3 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 177 | }, | 177 | }, |
| 178 | }, | 178 | }, |
| 179 | ]; | 179 | ]; |
| 180 | - | ||
| 181 | -export const tableData = [ | ||
| 182 | - { | ||
| 183 | - id: "1", | ||
| 184 | - flightRand: "LZ003;LZ00", | ||
| 185 | - status: "1", | ||
| 186 | - fltNo: "FX0090", | ||
| 187 | - includeUrsa: "URSACODE191", | ||
| 188 | - notIncludeUrsa: "P_3", | ||
| 189 | - createTime: "2023-08-14", | ||
| 190 | - createUserName: "wjh", | ||
| 191 | - updateTime: "2023-08-14", | ||
| 192 | - updateUserName: "wjh", | ||
| 193 | - }, | ||
| 194 | - { | ||
| 195 | - id: "2", | ||
| 196 | - flightRand: "LP001;LP004+1", | ||
| 197 | - status: "3", | ||
| 198 | - fltNo: "FX0090", | ||
| 199 | - includeUrsa: "P_;URSACODE105", | ||
| 200 | - notIncludeUrsa: "P_21", | ||
| 201 | - createTime: "2023-08-14", | ||
| 202 | - createUserName: "wjh", | ||
| 203 | - updateTime: "2023-08-14", | ||
| 204 | - updateUserName: "wjh", | ||
| 205 | - }, | ||
| 206 | - { | ||
| 207 | - id: "3", | ||
| 208 | - flightRand: "CQ00;LZ003;CS0004", | ||
| 209 | - status: "1", | ||
| 210 | - fltNo: "CS0002", | ||
| 211 | - includeUrsa: "URSACODE12", | ||
| 212 | - notIncludeUrsa: "P_2", | ||
| 213 | - createTime: "2023-08-14", | ||
| 214 | - createUserName: "wjh", | ||
| 215 | - updateTime: "2023-08-14", | ||
| 216 | - updateUserName: "wjh", | ||
| 217 | - }, | ||
| 218 | - { | ||
| 219 | - id: "4", | ||
| 220 | - flightRand: "LZ001;LZ002;LZ004", | ||
| 221 | - status: "1", | ||
| 222 | - fltNo: "FX0090", | ||
| 223 | - includeUrsa: "URSACODE192", | ||
| 224 | - notIncludeUrsa: "P_17", | ||
| 225 | - createTime: "2023-08-11", | ||
| 226 | - createUserName: "wjh", | ||
| 227 | - updateTime: "2023-08-11", | ||
| 228 | - updateUserName: "wjh", | ||
| 229 | - }, | ||
| 230 | - { | ||
| 231 | - id: "5", | ||
| 232 | - flightRand: "PS001;PS003", | ||
| 233 | - status: "1", | ||
| 234 | - fltNo: "FX0091", | ||
| 235 | - includeUrsa: "URSACODE10", | ||
| 236 | - notIncludeUrsa: "P_28", | ||
| 237 | - createTime: "2023-08-11", | ||
| 238 | - createUserName: "wjh", | ||
| 239 | - updateTime: "2023-08-11", | ||
| 240 | - updateUserName: "wjh", | ||
| 241 | - }, | ||
| 242 | - { | ||
| 243 | - id: "6", | ||
| 244 | - flightRand: "PS002;PS003", | ||
| 245 | - status: "3", | ||
| 246 | - fltNo: "XN007", | ||
| 247 | - includeUrsa: "URSACODE27", | ||
| 248 | - notIncludeUrsa: "P_4", | ||
| 249 | - createTime: "2023-08-11", | ||
| 250 | - createUserName: "wjh", | ||
| 251 | - updateTime: "2023-08-11", | ||
| 252 | - updateUserName: "wjh", | ||
| 253 | - }, | ||
| 254 | - { | ||
| 255 | - id: "7", | ||
| 256 | - flightRand: "XN001;XN002;XN003;XN004", | ||
| 257 | - status: "1", | ||
| 258 | - fltNo: "XN001", | ||
| 259 | - includeUrsa: "URSACODE34", | ||
| 260 | - notIncludeUrsa: "P_7", | ||
| 261 | - createTime: "2023-08-10", | ||
| 262 | - createUserName: "wjh", | ||
| 263 | - updateTime: "2023-08-10", | ||
| 264 | - updateUserName: "wjh", | ||
| 265 | - }, | ||
| 266 | - { | ||
| 267 | - id: "8", | ||
| 268 | - flightRand: "HA004", | ||
| 269 | - status: "3", | ||
| 270 | - fltNo: "LZ007", | ||
| 271 | - includeUrsa: "URSACODE71", | ||
| 272 | - notIncludeUrsa: "P_2", | ||
| 273 | - createTime: "2023-08-10", | ||
| 274 | - createUserName: "wjh", | ||
| 275 | - updateTime: "2023-08-10", | ||
| 276 | - updateUserName: "wjh", | ||
| 277 | - }, | ||
| 278 | - { | ||
| 279 | - id: "9", | ||
| 280 | - flightRand: "AB0001;AB123", | ||
| 281 | - status: "1", | ||
| 282 | - fltNo: "AB0001", | ||
| 283 | - includeUrsa: "URSACODE87", | ||
| 284 | - notIncludeUrsa: "P_26", | ||
| 285 | - createTime: "2023-08-10", | ||
| 286 | - createUserName: "wjh", | ||
| 287 | - updateTime: "2023-08-10", | ||
| 288 | - updateUserName: "wjh", | ||
| 289 | - }, | ||
| 290 | -]; | ... | ... |
| ... | @@ -388,17 +388,7 @@ export default { | ... | @@ -388,17 +388,7 @@ export default { |
| 388 | cancelButtonText: "取消", | 388 | cancelButtonText: "取消", |
| 389 | type: "warning", | 389 | type: "warning", |
| 390 | }).then(() => { | 390 | }).then(() => { |
| 391 | - this.msgWarning('待联调!') | 391 | + this.routeDel({ data: [val], id: [val.id] }) |
| 392 | - // delDict(val).then(res => { | ||
| 393 | - // if (res.code === 200) { | ||
| 394 | - // this.msgSuccess(res.msg) | ||
| 395 | - // } else { | ||
| 396 | - // this.msgWarning(res.msg) | ||
| 397 | - // } | ||
| 398 | - // this.tableSelect() // 回调查询 | ||
| 399 | - // }).catch(err => { | ||
| 400 | - // console.log(err) | ||
| 401 | - // }) | ||
| 402 | }).catch(() => { }) | 392 | }).catch(() => { }) |
| 403 | } | 393 | } |
| 404 | } else { | 394 | } else { | ... | ... |
-
Please register or login to post a comment