Showing
9 changed files
with
221 additions
and
305 deletions
| ... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
| 4 | <el-col> | 4 | <el-col> |
| 5 | <el-button | 5 | <el-button |
| 6 | v-for="item in attrs.btnCofig.btnGroup" | 6 | v-for="item in attrs.btnCofig.btnGroup" |
| 7 | - :key="item.icon" | 7 | + :key="item.btnName" |
| 8 | :type="item.type" | 8 | :type="item.type" |
| 9 | :icon="item.icon" | 9 | :icon="item.icon" |
| 10 | :round="item.round" | 10 | :round="item.round" | ... | ... |
| ... | @@ -72,13 +72,6 @@ export const constantRoutes = [ | ... | @@ -72,13 +72,6 @@ export const constantRoutes = [ |
| 72 | component: Layout, | 72 | component: Layout, |
| 73 | hidden: true, | 73 | hidden: true, |
| 74 | children: [ | 74 | children: [ |
| 75 | - // { | ||
| 76 | - // path: "/et86", | ||
| 77 | - // component: (resolve) => require(["@/views/et86Config/et86RuleConfig"], resolve), | ||
| 78 | - // name: "et86", | ||
| 79 | - // meta: { title: "ET86", icon: "user" }, | ||
| 80 | - // children: [], | ||
| 81 | - // }, | ||
| 82 | { | 75 | { |
| 83 | path: "/edit", | 76 | path: "/edit", |
| 84 | component: (resolve) => | 77 | component: (resolve) => |
| ... | @@ -87,6 +80,13 @@ export const constantRoutes = [ | ... | @@ -87,6 +80,13 @@ export const constantRoutes = [ |
| 87 | meta: { title: "ET86规则", icon: "user", noCache: false }, | 80 | meta: { title: "ET86规则", icon: "user", noCache: false }, |
| 88 | }, | 81 | }, |
| 89 | { | 82 | { |
| 83 | + path: "/errorInfo", | ||
| 84 | + component: (resolve) => | ||
| 85 | + require(["@/views/et86Config/et86HsCodeBlack/errorInfo"], resolve), | ||
| 86 | + name: "errorInfo", | ||
| 87 | + meta: { title: "错误信息提示", icon: "user" }, | ||
| 88 | + }, | ||
| 89 | + { | ||
| 90 | path: "/info/:handle/id=:id;routeStatus=:routeStatus;fltNo=:fltNo;route=:route;fltDate=:fltDate;status=:status", | 90 | path: "/info/:handle/id=:id;routeStatus=:routeStatus;fltNo=:fltNo;route=:route;fltDate=:fltDate;status=:status", |
| 91 | component: (resolve) => | 91 | component: (resolve) => |
| 92 | require(["@/views/allocationConfig/flightAllocConfig/info"], resolve), | 92 | require(["@/views/allocationConfig/flightAllocConfig/info"], resolve), | ... | ... |
| 1 | +<template> | ||
| 2 | + <div class="form-header container"> | ||
| 3 | + <yl-table | ||
| 4 | + :attrs="tableAttr" | ||
| 5 | + :loadingTable="tableAttr.loadingTable" | ||
| 6 | + :columns="columns" | ||
| 7 | + :tableData="tableData" | ||
| 8 | + :pageConfig="pageConfig" | ||
| 9 | + @sizeChange="handleSizeChange" | ||
| 10 | + @currentChange="handleCurrentChange" | ||
| 11 | + > | ||
| 12 | + </yl-table> | ||
| 13 | + </div> | ||
| 14 | +</template> | ||
| 15 | + | ||
| 16 | +<script> | ||
| 17 | +import YlTable from "@/components/YlTable"; | ||
| 18 | +import { tableAttr, columnHeader } from "./tableConfig"; | ||
| 19 | +export default { | ||
| 20 | + name: "ErrorInfo", | ||
| 21 | + components: { | ||
| 22 | + YlTable, | ||
| 23 | + }, | ||
| 24 | + data() { | ||
| 25 | + return { | ||
| 26 | + pageConfig: { | ||
| 27 | + // 分页配置项 | ||
| 28 | + isPagination: false, | ||
| 29 | + total: 0, | ||
| 30 | + pageData: { | ||
| 31 | + page: 1, | ||
| 32 | + size: 10, | ||
| 33 | + }, | ||
| 34 | + }, | ||
| 35 | + tableAttr: tableAttr, // table配置项 | ||
| 36 | + columns: columnHeader(this.deleteRow), // 表头 | ||
| 37 | + tableData: [], // 表格数据 | ||
| 38 | + }; | ||
| 39 | + }, | ||
| 40 | + created() {}, | ||
| 41 | + methods: { | ||
| 42 | + //条数变化 | ||
| 43 | + handleSizeChange(e) { | ||
| 44 | + this.pageConfig.pageData.size = e; | ||
| 45 | + this.pageConfig.pageData.page = 1; | ||
| 46 | + this.searchBtn(); | ||
| 47 | + }, | ||
| 48 | + //页码变化 | ||
| 49 | + handleCurrentChange(e) { | ||
| 50 | + this.pageConfig.pageData.page = e; | ||
| 51 | + this.searchBtn(); | ||
| 52 | + }, | ||
| 53 | + // table勾选 | ||
| 54 | + handleSelectionChange(val) { | ||
| 55 | + this.multipleSelection = val; | ||
| 56 | + }, | ||
| 57 | + }, | ||
| 58 | +}; | ||
| 59 | +</script> | ||
| 60 | +<style lang="scss" scoped></style> |
| 1 | +export const tableAttr = { | ||
| 2 | + border: true, | ||
| 3 | + loadingTable: false, | ||
| 4 | + isDragSort: false, // 拖拽tableData数据一定要加id字段 | ||
| 5 | + maxHeight: 300, | ||
| 6 | + btnCofig: { | ||
| 7 | + isBtn: false, | ||
| 8 | + btnGroup: [], | ||
| 9 | + }, | ||
| 10 | +}; | ||
| 11 | +export const columnHeader = (deleteRow) => [ | ||
| 12 | + { | ||
| 13 | + type: "index", | ||
| 14 | + label: "序号", | ||
| 15 | + prop: "id", | ||
| 16 | + align: "center", | ||
| 17 | + width: "70", | ||
| 18 | + }, | ||
| 19 | + { | ||
| 20 | + label: "运单号", | ||
| 21 | + prop: "waybillNo", | ||
| 22 | + align: "center", | ||
| 23 | + width: 150, | ||
| 24 | + }, | ||
| 25 | + { | ||
| 26 | + label: "错误信息", | ||
| 27 | + prop: "errorMessage", | ||
| 28 | + align: "center", | ||
| 29 | + minWidth: 150, | ||
| 30 | + }, | ||
| 31 | +]; |
| ... | @@ -5,6 +5,7 @@ export const formConfig = [ | ... | @@ -5,6 +5,7 @@ export const formConfig = [ |
| 5 | name: "skuCode", | 5 | name: "skuCode", |
| 6 | prop: "skuCode", | 6 | prop: "skuCode", |
| 7 | placeholder: "根据Hscode查询", | 7 | placeholder: "根据Hscode查询", |
| 8 | + span: 6, | ||
| 8 | trigger: "blur", // 事件名 | 9 | trigger: "blur", // 事件名 |
| 9 | }, | 10 | }, |
| 10 | ]; | 11 | ]; | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | - <div style="margin: 20px"> | 2 | + <div class="form-header container"> |
| 3 | - <el-form :inline="true" :model="form" class="demo-form-inline" size="small"> | 3 | + <el-row> |
| 4 | - <el-form-item label="商品名"> | 4 | + <el-col> |
| 5 | - <el-input | 5 | + <yl-form |
| 6 | - v-model="form.skuCode" | 6 | + ref="ruleForm" |
| 7 | - placeholder="根据Hscode查询" | 7 | + :formConfig="formConfig" |
| 8 | - ></el-input> | 8 | + :queryForm="queryForm" |
| 9 | - </el-form-item> | 9 | + :inline="false" |
| 10 | - <el-form-item> | 10 | + formWidth="auto" |
| 11 | - <el-upload | 11 | + @blur="blurEvent" |
| 12 | - action="/flightInfoImport/importFlight" | 12 | + /> |
| 13 | - name="file" | 13 | + </el-col> |
| 14 | - :http-request="uploadExcel" | 14 | + </el-row> |
| 15 | - :on-remove="handleRemove" | 15 | + <yl-table |
| 16 | - :limit="1" | 16 | + :attrs="tableAttr" |
| 17 | - :on-exceed="handleExceed" | 17 | + :loadingTable="tableAttr.loadingTable" |
| 18 | - :file-list="fileList" | 18 | + :columns="columns" |
| 19 | - accept=".xlsx" | 19 | + :tableData="tableData" |
| 20 | - class="upload-demo" | 20 | + :pageConfig="pageConfig" |
| 21 | - v-hasPermi="['base:flightImport:importFlight']" | 21 | + @search="searchBtn" |
| 22 | - > | 22 | + @download="downloadTemplate" |
| 23 | - <el-button icon="el-icon-upload2" type="primary">点击上传</el-button> | 23 | + @upLoad="upLoadTemplate" |
| 24 | - </el-upload> | 24 | + @export="exportTemplate" |
| 25 | - </el-form-item> | 25 | + @delete="deleteData" |
| 26 | - <el-form-item> | 26 | + @sizeChange="handleSizeChange" |
| 27 | - <el-button | 27 | + @currentChange="handleCurrentChange" |
| 28 | - type="primary" | ||
| 29 | - icon="el-icon-download" | ||
| 30 | - @click="downloadTempleate" | ||
| 31 | - v-hasPermi="['base:flightImport:exportExcel']" | ||
| 32 | - >下载模板 | ||
| 33 | - </el-button> | ||
| 34 | - </el-form-item> | ||
| 35 | - </el-form> | ||
| 36 | - <div style="font-size: 12px; font-weight: 700; margin-bottom: 15px"> | ||
| 37 | - 提示:<span style="color: #1890ff">以下为所提交的数据或出错信息</span> | ||
| 38 | - </div> | ||
| 39 | - <div class="btn-wrap"> | ||
| 40 | - <el-button | ||
| 41 | - type="danger" | ||
| 42 | - size="mini" | ||
| 43 | - icon="el-icon-delete" | ||
| 44 | - @click="deleteRow" | ||
| 45 | - >删除</el-button | ||
| 46 | - > | ||
| 47 | - </div> | ||
| 48 | - <el-table | ||
| 49 | - ref="filterTable" | ||
| 50 | - class="mt10" | ||
| 51 | - :data="tableData" | ||
| 52 | - size="small" | ||
| 53 | - border | ||
| 54 | - @selection-change="handleSelectionChange" | ||
| 55 | > | 28 | > |
| 56 | - <el-table-column type="selection" width="55"></el-table-column> | 29 | + </yl-table> |
| 57 | - <el-table-column label="行号" prop="line" width="50" align="center"> | ||
| 58 | - </el-table-column> | ||
| 59 | - <el-table-column label="错误信息" prop="errorMessage" width="200"> | ||
| 60 | - <template slot-scope="scope"> | ||
| 61 | - <div v-for="(m, key) in scope.row.errorMessage" :key="key"> | ||
| 62 | - {{ m }} | ||
| 63 | - </div> | ||
| 64 | - </template> | ||
| 65 | - </el-table-column> | ||
| 66 | - <el-table-column v-if="tableData.length == 0"></el-table-column> | ||
| 67 | - <template v-for="(value, key) in this.tableData[0]"> | ||
| 68 | - <el-table-column | ||
| 69 | - :key="key" | ||
| 70 | - v-if="key != 'errorMessage' && key != 'line'" | ||
| 71 | - :label="key" | ||
| 72 | - :prop="key" | ||
| 73 | - ></el-table-column> | ||
| 74 | - </template> | ||
| 75 | - </el-table> | ||
| 76 | - <ModleView ref="modleView" /> | ||
| 77 | </div> | 30 | </div> |
| 78 | </template> | 31 | </template> |
| 79 | 32 | ||
| 80 | <script> | 33 | <script> |
| 81 | -import { | 34 | +import YlForm from "@/components/YlForm"; |
| 82 | - filghtKindData, | 35 | +import YlTable from "@/components/YlTable"; |
| 83 | - downLoadTemplate, | 36 | +import { formConfig } from "./formConfig"; |
| 84 | - importFlight, | 37 | +import { tableAttr, columnHeader } from "./tableConfig"; |
| 85 | -} from "@/api/flightInfoImport"; | ||
| 86 | -import ModleView from "./components/ModleView"; | ||
| 87 | export default { | 38 | export default { |
| 88 | - name: "FlightInformationImport", | 39 | + name: "Et86HsCodeBlack", |
| 89 | components: { | 40 | components: { |
| 90 | - ModleView, | 41 | + YlForm, |
| 42 | + YlTable, | ||
| 91 | }, | 43 | }, |
| 92 | data() { | 44 | data() { |
| 93 | return { | 45 | return { |
| 94 | - flightType: [], | 46 | + formConfig: formConfig, // 表单配置项 |
| 95 | - form: { | 47 | + queryForm: {}, // 表单参数 |
| 96 | - skuCode: "", | 48 | + pageConfig: { |
| 49 | + // 分页配置项 | ||
| 50 | + isPagination: true, | ||
| 51 | + total: 0, | ||
| 52 | + pageData: { | ||
| 53 | + page: 1, | ||
| 54 | + size: 10, | ||
| 55 | + }, | ||
| 97 | }, | 56 | }, |
| 98 | - fileList: [], | 57 | + tableAttr: tableAttr, // table配置项 |
| 99 | - tableData: [], | 58 | + columns: columnHeader(this.deleteRow), // 表头 |
| 59 | + tableData: [], // 表格数据 | ||
| 100 | multipleSelection: [], | 60 | multipleSelection: [], |
| 101 | }; | 61 | }; |
| 102 | }, | 62 | }, |
| 63 | + created() {}, | ||
| 103 | methods: { | 64 | methods: { |
| 104 | - typeData() { | 65 | + // 失焦事件 |
| 105 | - filghtKindData().then((response) => { | 66 | + blurEvent() { |
| 106 | - if (response.code != 200) { | 67 | + |
| 107 | - this.msgError(response.msg); | ||
| 108 | - } | ||
| 109 | - this.flightType = response.data; | ||
| 110 | - this.form.type = response.data[0].code; | ||
| 111 | - }); | ||
| 112 | - }, | ||
| 113 | - downloadTempleate() { | ||
| 114 | - let downloadType = ""; | ||
| 115 | - let fileName = ""; | ||
| 116 | - switch (this.form.type) { | ||
| 117 | - case "flightKind20": | ||
| 118 | - downloadType = "whiteTail"; | ||
| 119 | - fileName = "航班信息导入模板WhiteTail.xlsx"; | ||
| 120 | - break; | ||
| 121 | - case "flightKind30": | ||
| 122 | - downloadType = "purpleTail"; | ||
| 123 | - fileName = "航班信息导入模板PurpleTail.xlsx"; | ||
| 124 | - break; | ||
| 125 | - default: | ||
| 126 | - this.$confirm("此类航班暂无模板,请选择其他类型航班", "提示", { | ||
| 127 | - confirmButtonText: "确定", | ||
| 128 | - showCancelButton: false, | ||
| 129 | - type: "warning", | ||
| 130 | - }); | ||
| 131 | - } | ||
| 132 | - if (downloadType != "") { | ||
| 133 | - downLoadTemplate(downloadType).then((res) => { | ||
| 134 | - if (res) { | ||
| 135 | - const blob = new Blob([res]); | ||
| 136 | - const link = document.createElement("a"); //创建a标签 | ||
| 137 | - link.download = fileName; //a标签添加属性 | ||
| 138 | - link.style.display = "none"; | ||
| 139 | - link.href = URL.createObjectURL(blob); | ||
| 140 | - document.body.appendChild(link); | ||
| 141 | - link.click(); //执行下载 | ||
| 142 | - URL.revokeObjectURL(link.href); //释放url | ||
| 143 | - document.body.removeChild(link); //释放标签 | ||
| 144 | - } else { | ||
| 145 | - this.$message.error("下载失败"); | ||
| 146 | - } | ||
| 147 | - }); | ||
| 148 | - } | ||
| 149 | }, | 68 | }, |
| 150 | - uploadExcel(option) { | 69 | + // 搜索 |
| 151 | - //上传excel | 70 | + searchBtn() { |
| 152 | - const file = option.file; | 71 | + this.$refs.ruleForm.handleSearch("ruleForm", (val) => {}); |
| 153 | - importFlight(file, this.form.type).then((res) => { | ||
| 154 | - if (res.code != 200) { | ||
| 155 | - if (res.code == 603) { | ||
| 156 | - this.$alert(res.msg, "提示", { | ||
| 157 | - confirmButtonText: "确定", | ||
| 158 | - type: "warning", | ||
| 159 | - }); | ||
| 160 | - } else { | ||
| 161 | - this.$confirm("是否查看错误信息列表?", "提示", { | ||
| 162 | - confirmButtonText: "确定", | ||
| 163 | - cancelButtonText: "取消", | ||
| 164 | - type: "warning", | ||
| 165 | - center: true, | ||
| 166 | - }).then(() => { | ||
| 167 | - console.log(this.$refs.modleView); | ||
| 168 | - this.$refs.modleView.dialogOpenEvent(res.data) | ||
| 169 | - }) | ||
| 170 | - .catch(() => {}); | ||
| 171 | - this.$message.warning(res.msg); | ||
| 172 | - this.tableData = res.data; | ||
| 173 | - } | ||
| 174 | - } else { | ||
| 175 | - this.$message.success("导入成功"); | ||
| 176 | - this.tableData = res.data; | ||
| 177 | - } | ||
| 178 | - }); | ||
| 179 | }, | 72 | }, |
| 180 | - handleRemove(file, fileList) { | 73 | + // 下载 |
| 181 | - //清掉上传的文件 | 74 | + downloadTemplate() {}, |
| 182 | - this.tableData = []; | 75 | + // 上传 |
| 183 | - this.fileList = []; | 76 | + upLoadTemplate() {}, |
| 77 | + // 导出 | ||
| 78 | + exportTemplate() {}, | ||
| 79 | + // 删除 | ||
| 80 | + deleteData() {}, | ||
| 81 | + //条数变化 | ||
| 82 | + handleSizeChange(e) { | ||
| 83 | + this.pageConfig.pageData.size = e; | ||
| 84 | + this.pageConfig.pageData.page = 1; | ||
| 85 | + this.searchBtn(); | ||
| 184 | }, | 86 | }, |
| 185 | - handleExceed(files) { | 87 | + //页码变化 |
| 186 | - //重复上传文件 | 88 | + handleCurrentChange(e) { |
| 187 | - let file = {}; | 89 | + this.pageConfig.pageData.page = e; |
| 188 | - file.file = files[0]; | 90 | + this.searchBtn(); |
| 189 | - file.name = files[0].name; | ||
| 190 | - this.fileList = []; | ||
| 191 | - this.fileList.push(file); | ||
| 192 | - this.uploadExcel(file); | ||
| 193 | }, | 91 | }, |
| 92 | + // table勾选 | ||
| 194 | handleSelectionChange(val) { | 93 | handleSelectionChange(val) { |
| 195 | this.multipleSelection = val; | 94 | this.multipleSelection = val; |
| 196 | }, | 95 | }, |
| 96 | + // 删除 | ||
| 197 | deleteRow() { | 97 | deleteRow() { |
| 198 | this.$confirm("是否确认删除?", "提示", { | 98 | this.$confirm("是否确认删除?", "提示", { |
| 199 | confirmButtonText: "确定", | 99 | confirmButtonText: "确定", |
| ... | @@ -207,22 +107,6 @@ export default { | ... | @@ -207,22 +107,6 @@ export default { |
| 207 | .catch(() => {}); | 107 | .catch(() => {}); |
| 208 | }, | 108 | }, |
| 209 | }, | 109 | }, |
| 210 | - created() { | ||
| 211 | - this.typeData(); | ||
| 212 | - }, | ||
| 213 | - activated() { | ||
| 214 | - this.typeData(); | ||
| 215 | - }, | ||
| 216 | }; | 110 | }; |
| 217 | </script> | 111 | </script> |
| 218 | -<style rel="stylesheet/scss" lang="scss"> | 112 | +<style lang="scss" scoped></style> |
| 219 | -.upload-demo { | ||
| 220 | - float: right; | ||
| 221 | -} | ||
| 222 | - | ||
| 223 | -.el-upload-list { | ||
| 224 | - display: inline-block; | ||
| 225 | - margin-left: 10px; | ||
| 226 | - vertical-align: top; | ||
| 227 | -} | ||
| 228 | -</style> | ... | ... |
| 1 | -const state = { | ||
| 2 | - 1: "有效", | ||
| 3 | - 0: "无效", | ||
| 4 | -}; | ||
| 5 | export const tableAttr = { | 1 | export const tableAttr = { |
| 6 | border: true, | 2 | border: true, |
| 7 | loadingTable: false, | 3 | loadingTable: false, |
| ... | @@ -21,6 +17,15 @@ export const tableAttr = { | ... | @@ -21,6 +17,15 @@ export const tableAttr = { |
| 21 | }, | 17 | }, |
| 22 | { | 18 | { |
| 23 | type: "primary", | 19 | type: "primary", |
| 20 | + icon: "el-icon-download", | ||
| 21 | + btnName: "下载模板", | ||
| 22 | + size: "mini", | ||
| 23 | + round: false, | ||
| 24 | + loading: false, | ||
| 25 | + event: "download", | ||
| 26 | + }, | ||
| 27 | + { | ||
| 28 | + type: "primary", | ||
| 24 | icon: "el-icon-upload", | 29 | icon: "el-icon-upload", |
| 25 | btnName: "导入", | 30 | btnName: "导入", |
| 26 | size: "mini", | 31 | size: "mini", |
| ... | @@ -35,7 +40,7 @@ export const tableAttr = { | ... | @@ -35,7 +40,7 @@ export const tableAttr = { |
| 35 | size: "mini", | 40 | size: "mini", |
| 36 | round: false, | 41 | round: false, |
| 37 | loading: false, | 42 | loading: false, |
| 38 | - event: "download", | 43 | + event: "export", |
| 39 | }, | 44 | }, |
| 40 | { | 45 | { |
| 41 | type: "danger", | 46 | type: "danger", |
| ... | @@ -49,7 +54,7 @@ export const tableAttr = { | ... | @@ -49,7 +54,7 @@ export const tableAttr = { |
| 49 | ], | 54 | ], |
| 50 | }, | 55 | }, |
| 51 | }; | 56 | }; |
| 52 | -export const columnHeader = (viewRow, editRow, deleteRow) => [ | 57 | +export const columnHeader = (deleteRow) => [ |
| 53 | { | 58 | { |
| 54 | type: "selection", | 59 | type: "selection", |
| 55 | align: "center", | 60 | align: "center", |
| ... | @@ -64,64 +69,34 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -64,64 +69,34 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 64 | width: "50", | 69 | width: "50", |
| 65 | }, | 70 | }, |
| 66 | { | 71 | { |
| 67 | - label: "原航班号", | 72 | + label: "货站名称", |
| 68 | - prop: "originOfFlightNo", | 73 | + prop: "portName", |
| 69 | align: "center", | 74 | align: "center", |
| 70 | minWidth: 100, | 75 | minWidth: 100, |
| 71 | }, | 76 | }, |
| 72 | { | 77 | { |
| 73 | - label: "顺位航班", | 78 | + label: "品名", |
| 74 | - prop: "rankFltNoStr", | 79 | + prop: "goodsName", |
| 75 | align: "center", | 80 | align: "center", |
| 76 | minWidth: 100, | 81 | minWidth: 100, |
| 77 | }, | 82 | }, |
| 78 | { | 83 | { |
| 79 | - label: "URSA包含", | 84 | + label: "操作人", |
| 80 | - prop: "includeUrsa", | 85 | + prop: "updateUserName", |
| 81 | - align: "center", | ||
| 82 | - minWidth: 100, | ||
| 83 | - }, | ||
| 84 | - { | ||
| 85 | - label: "URSA不包含", | ||
| 86 | - prop: "notIncludeUrsa", | ||
| 87 | align: "center", | 86 | align: "center", |
| 88 | minWidth: 100, | 87 | minWidth: 100, |
| 89 | }, | 88 | }, |
| 90 | { | 89 | { |
| 91 | - label: "状态", | 90 | + label: "操作时间", |
| 92 | - prop: "status", | 91 | + prop: "updateTime", |
| 93 | align: "center", | 92 | align: "center", |
| 94 | minWidth: 100, | 93 | minWidth: 100, |
| 95 | - render: (h, params) => { | ||
| 96 | - const { row } = params; | ||
| 97 | - return h("div", `${state[row.status]}`); | ||
| 98 | - }, | ||
| 99 | }, | 94 | }, |
| 100 | { | 95 | { |
| 101 | label: "创建时间", | 96 | label: "创建时间", |
| 102 | prop: "createTime", | 97 | prop: "createTime", |
| 103 | align: "center", | 98 | align: "center", |
| 104 | minWidth: 100, | 99 | minWidth: 100, |
| 105 | - sortable: true, | ||
| 106 | - "sort-method": (a, b) => b.createTime - a.createTime, | ||
| 107 | - }, | ||
| 108 | - { | ||
| 109 | - label: "创建人", | ||
| 110 | - prop: "createUserName", | ||
| 111 | - align: "center", | ||
| 112 | - minWidth: 100, | ||
| 113 | - }, | ||
| 114 | - { | ||
| 115 | - label: "修改时间", | ||
| 116 | - prop: "updateTime", | ||
| 117 | - align: "center", | ||
| 118 | - minWidth: 100, | ||
| 119 | - }, | ||
| 120 | - { | ||
| 121 | - label: "修改人", | ||
| 122 | - prop: "updateUserName", | ||
| 123 | - align: "center", | ||
| 124 | - minWidth: 100, | ||
| 125 | }, | 100 | }, |
| 126 | { | 101 | { |
| 127 | label: "操作", | 102 | label: "操作", |
| ... | @@ -134,38 +109,6 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -134,38 +109,6 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 134 | h( | 109 | h( |
| 135 | "el-button", | 110 | "el-button", |
| 136 | { | 111 | { |
| 137 | - props: { | ||
| 138 | - type: "text", | ||
| 139 | - size: "mini", | ||
| 140 | - icon: "el-icon-view", | ||
| 141 | - }, | ||
| 142 | - on: { | ||
| 143 | - click() { | ||
| 144 | - viewRow(params); | ||
| 145 | - }, | ||
| 146 | - }, | ||
| 147 | - }, | ||
| 148 | - "查看" | ||
| 149 | - ), | ||
| 150 | - h( | ||
| 151 | - "el-button", | ||
| 152 | - { | ||
| 153 | - props: { | ||
| 154 | - type: "text", | ||
| 155 | - size: "mini", | ||
| 156 | - icon: "el-icon-edit", | ||
| 157 | - }, | ||
| 158 | - on: { | ||
| 159 | - click() { | ||
| 160 | - editRow(params); | ||
| 161 | - }, | ||
| 162 | - }, | ||
| 163 | - }, | ||
| 164 | - "修改" | ||
| 165 | - ), | ||
| 166 | - h( | ||
| 167 | - "el-button", | ||
| 168 | - { | ||
| 169 | style: { | 112 | style: { |
| 170 | color: "#ff4949", | 113 | color: "#ff4949", |
| 171 | }, | 114 | }, | ... | ... |
| ... | @@ -72,32 +72,29 @@ export default { | ... | @@ -72,32 +72,29 @@ export default { |
| 72 | // ET86查询 | 72 | // ET86查询 |
| 73 | queryFindAllEtesRules(params) { | 73 | queryFindAllEtesRules(params) { |
| 74 | this.tableAttr.loadingTable = true; | 74 | this.tableAttr.loadingTable = true; |
| 75 | - findAllEtesRules(params).then((res) => { | 75 | + findAllEtesRules(params) |
| 76 | + .then((res) => { | ||
| 76 | this.tableAttr.loadingTable = false; | 77 | this.tableAttr.loadingTable = false; |
| 77 | const { code, data } = res; | 78 | const { code, data } = res; |
| 78 | if (code == 200) { | 79 | if (code == 200) { |
| 79 | this.tableData = data.list; | 80 | this.tableData = data.list; |
| 80 | this.pageConfig.total = data.total; | 81 | this.pageConfig.total = data.total; |
| 81 | } | 82 | } |
| 82 | - }).catch(() => {}); | 83 | + }) |
| 84 | + .catch(() => {}); | ||
| 83 | }, | 85 | }, |
| 84 | - //条数变化 | 86 | + // 失焦事件 |
| 85 | - handleSizeChange(e) { | 87 | + blurEvent({ originOfFlightNo }) { |
| 86 | - this.pageConfig.pageData.size = e; | 88 | + this.queryForm.originOfFlightNo = this.upCase(originOfFlightNo); |
| 87 | - this.pageConfig.pageData.page = 1; | ||
| 88 | - this.searchBtn(); | ||
| 89 | - }, | ||
| 90 | - //页码变化 | ||
| 91 | - handleCurrentChange(e) { | ||
| 92 | - this.pageConfig.pageData.page = e; | ||
| 93 | - this.searchBtn(); | ||
| 94 | }, | 89 | }, |
| 95 | // 搜索 | 90 | // 搜索 |
| 96 | searchBtn() { | 91 | searchBtn() { |
| 97 | const { page, size } = this.pageConfig.pageData; | 92 | const { page, size } = this.pageConfig.pageData; |
| 98 | let params = { | 93 | let params = { |
| 99 | originOfFlightNo: this.queryForm.originOfFlightNo, | 94 | originOfFlightNo: this.queryForm.originOfFlightNo, |
| 100 | - updateTimeStart: this.queryForm.startTime ? this.queryForm.startTime : "", | 95 | + updateTimeStart: this.queryForm.startTime |
| 96 | + ? this.queryForm.startTime | ||
| 97 | + : "", | ||
| 101 | updateTimeEnd: this.queryForm.endTime ? this.queryForm.endTime : "", | 98 | updateTimeEnd: this.queryForm.endTime ? this.queryForm.endTime : "", |
| 102 | limitStart: (page - 1) * size, | 99 | limitStart: (page - 1) * size, |
| 103 | limitSize: size, | 100 | limitSize: size, |
| ... | @@ -110,9 +107,16 @@ export default { | ... | @@ -110,9 +107,16 @@ export default { |
| 110 | this.queryFindAllEtesRules(params); | 107 | this.queryFindAllEtesRules(params); |
| 111 | }); | 108 | }); |
| 112 | }, | 109 | }, |
| 113 | - // 重置表单 | 110 | + //条数变化 |
| 114 | - restForm() { | 111 | + handleSizeChange(e) { |
| 115 | - this.$refs.ruleForm.resetFields("ruleForm"); | 112 | + this.pageConfig.pageData.size = e; |
| 113 | + this.pageConfig.pageData.page = 1; | ||
| 114 | + this.searchBtn(); | ||
| 115 | + }, | ||
| 116 | + //页码变化 | ||
| 117 | + handleCurrentChange(e) { | ||
| 118 | + this.pageConfig.pageData.page = e; | ||
| 119 | + this.searchBtn(); | ||
| 116 | }, | 120 | }, |
| 117 | // 添加 | 121 | // 添加 |
| 118 | addBtn(item) { | 122 | addBtn(item) { |
| ... | @@ -123,6 +127,10 @@ export default { | ... | @@ -123,6 +127,10 @@ export default { |
| 123 | }, | 127 | }, |
| 124 | }); | 128 | }); |
| 125 | }, | 129 | }, |
| 130 | + // 重置表单 | ||
| 131 | + restForm() { | ||
| 132 | + this.$refs.ruleForm.resetFields("ruleForm"); | ||
| 133 | + }, | ||
| 126 | // 查看 | 134 | // 查看 |
| 127 | viewRow({ row }) { | 135 | viewRow({ row }) { |
| 128 | this.$router.push({ | 136 | this.$router.push({ |
| ... | @@ -152,7 +160,8 @@ export default { | ... | @@ -152,7 +160,8 @@ export default { |
| 152 | cancelButtonText: "取消", | 160 | cancelButtonText: "取消", |
| 153 | type: "warning", | 161 | type: "warning", |
| 154 | center: true, | 162 | center: true, |
| 155 | - }).then(() => { | 163 | + }) |
| 164 | + .then(() => { | ||
| 156 | deleteEtesRuleById({ id: row.id }).then((res) => { | 165 | deleteEtesRuleById({ id: row.id }).then((res) => { |
| 157 | const { code, msg } = res; | 166 | const { code, msg } = res; |
| 158 | if (code == 200) { | 167 | if (code == 200) { |
| ... | @@ -162,12 +171,9 @@ export default { | ... | @@ -162,12 +171,9 @@ export default { |
| 162 | this.msgError(msg || "删除失败"); | 171 | this.msgError(msg || "删除失败"); |
| 163 | } | 172 | } |
| 164 | }); | 173 | }); |
| 165 | - }).catch(() => {}); | 174 | + }) |
| 175 | + .catch(() => {}); | ||
| 166 | }, | 176 | }, |
| 167 | - // 失焦事件 | ||
| 168 | - blurEvent({ originOfFlightNo }){ | ||
| 169 | - this.queryForm.originOfFlightNo = this.upCase(originOfFlightNo) | ||
| 170 | - } | ||
| 171 | }, | 177 | }, |
| 172 | }; | 178 | }; |
| 173 | </script> | 179 | </script> | ... | ... |
| ... | @@ -19,15 +19,6 @@ export const tableAttr = { | ... | @@ -19,15 +19,6 @@ export const tableAttr = { |
| 19 | loading: false, | 19 | loading: false, |
| 20 | event: "search", | 20 | event: "search", |
| 21 | }, | 21 | }, |
| 22 | - // { | ||
| 23 | - // type: "info", | ||
| 24 | - // icon: "", | ||
| 25 | - // btnName: "重置", | ||
| 26 | - // size: "mini", | ||
| 27 | - // round: false, | ||
| 28 | - // loading: false, | ||
| 29 | - // event: "restForm", | ||
| 30 | - // }, | ||
| 31 | { | 22 | { |
| 32 | type: "primary", | 23 | type: "primary", |
| 33 | icon: "el-icon-plus", | 24 | icon: "el-icon-plus", | ... | ... |
-
Please register or login to post a comment