Showing
10 changed files
with
95 additions
and
71 deletions
This diff is collapsed. Click to expand it.
| ... | @@ -147,7 +147,13 @@ export default { | ... | @@ -147,7 +147,13 @@ export default { |
| 147 | }, | 147 | }, |
| 148 | methods: { | 148 | methods: { |
| 149 | // HScode黑名单查询 | 149 | // HScode黑名单查询 |
| 150 | - queryFindHsCodeList(params) { | 150 | + queryFindHsCodeList() { |
| 151 | + const { page, size } = this.pageConfig.pageData; | ||
| 152 | + let params = { | ||
| 153 | + limitStart: (page - 1) * size, | ||
| 154 | + limitSize: size, | ||
| 155 | + ...this.queryForm, | ||
| 156 | + }; | ||
| 151 | this.tableAttr.loadingTable = true; | 157 | this.tableAttr.loadingTable = true; |
| 152 | findHsCodeList(params) | 158 | findHsCodeList(params) |
| 153 | .then((res) => { | 159 | .then((res) => { |
| ... | @@ -206,14 +212,10 @@ export default { | ... | @@ -206,14 +212,10 @@ export default { |
| 206 | }, | 212 | }, |
| 207 | // 搜索 | 213 | // 搜索 |
| 208 | searchBtn() { | 214 | searchBtn() { |
| 209 | - const { page, size } = this.pageConfig.pageData; | 215 | + this.pageConfig.pageData.page = 1; |
| 216 | + this.pageConfig.pageData.size = 10; | ||
| 210 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { | 217 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { |
| 211 | - let params = { | 218 | + this.queryFindHsCodeList(); |
| 212 | - limitStart: (page - 1) * size, | ||
| 213 | - limitSize: size, | ||
| 214 | - ...this.queryForm, | ||
| 215 | - }; | ||
| 216 | - this.queryFindHsCodeList(params); | ||
| 217 | }); | 219 | }); |
| 218 | }, | 220 | }, |
| 219 | // 确认对话框 | 221 | // 确认对话框 |
| ... | @@ -278,12 +280,12 @@ export default { | ... | @@ -278,12 +280,12 @@ export default { |
| 278 | handleSizeChange(e) { | 280 | handleSizeChange(e) { |
| 279 | this.pageConfig.pageData.size = e; | 281 | this.pageConfig.pageData.size = e; |
| 280 | this.pageConfig.pageData.page = 1; | 282 | this.pageConfig.pageData.page = 1; |
| 281 | - this.searchBtn(); | 283 | + this.queryFindHsCodeList(); |
| 282 | }, | 284 | }, |
| 283 | //页码变化 | 285 | //页码变化 |
| 284 | handleCurrentChange(e) { | 286 | handleCurrentChange(e) { |
| 285 | this.pageConfig.pageData.page = e; | 287 | this.pageConfig.pageData.page = e; |
| 286 | - this.searchBtn(); | 288 | + this.queryFindHsCodeList(); |
| 287 | }, | 289 | }, |
| 288 | // table勾选 | 290 | // table勾选 |
| 289 | tableSelectionChange(val) { | 291 | tableSelectionChange(val) { | ... | ... |
| ... | @@ -27,7 +27,7 @@ export const tableAttr = { | ... | @@ -27,7 +27,7 @@ export const tableAttr = { |
| 27 | { | 27 | { |
| 28 | type: "primary", | 28 | type: "primary", |
| 29 | icon: "el-icon-upload", | 29 | icon: "el-icon-upload", |
| 30 | - btnName: "增加", | 30 | + btnName: "导入", |
| 31 | size: "mini", | 31 | size: "mini", |
| 32 | round: false, | 32 | round: false, |
| 33 | loading: false, | 33 | loading: false, | ... | ... |
| ... | @@ -149,7 +149,7 @@ | ... | @@ -149,7 +149,7 @@ |
| 149 | maxlength="1000" | 149 | maxlength="1000" |
| 150 | show-word-limit | 150 | show-word-limit |
| 151 | :rows="4" | 151 | :rows="4" |
| 152 | - placeholder="请输入原航班号" | 152 | + placeholder="原航班号之间用分号分隔,例:LP001;LP002" |
| 153 | @blur="blurEvent" | 153 | @blur="blurEvent" |
| 154 | :disabled="!getRouter" | 154 | :disabled="!getRouter" |
| 155 | ></el-input> | 155 | ></el-input> |
| ... | @@ -170,7 +170,7 @@ | ... | @@ -170,7 +170,7 @@ |
| 170 | <el-col :span="10" :offset="1"> | 170 | <el-col :span="10" :offset="1"> |
| 171 | <el-input | 171 | <el-input |
| 172 | type="textarea" | 172 | type="textarea" |
| 173 | - v-model="serviceCode" | 173 | + v-model="queryForm.includeServiceType" |
| 174 | size="medium" | 174 | size="medium" |
| 175 | maxlength="1000" | 175 | maxlength="1000" |
| 176 | show-word-limit | 176 | show-word-limit |
| ... | @@ -253,7 +253,6 @@ | ... | @@ -253,7 +253,6 @@ |
| 253 | <el-col :span="10"> | 253 | <el-col :span="10"> |
| 254 | <el-input | 254 | <el-input |
| 255 | v-model.trim="queryForm.minWeight" | 255 | v-model.trim="queryForm.minWeight" |
| 256 | - clearable | ||
| 257 | placeholder="最小重量" | 256 | placeholder="最小重量" |
| 258 | @blur="inputBlurMinWeight($event)" | 257 | @blur="inputBlurMinWeight($event)" |
| 259 | :disabled="!getRouter" | 258 | :disabled="!getRouter" |
| ... | @@ -264,7 +263,6 @@ | ... | @@ -264,7 +263,6 @@ |
| 264 | <el-col :span="10"> | 263 | <el-col :span="10"> |
| 265 | <el-input | 264 | <el-input |
| 266 | v-model.trim="queryForm.maxWeight" | 265 | v-model.trim="queryForm.maxWeight" |
| 267 | - clearable | ||
| 268 | placeholder="最大重量" | 266 | placeholder="最大重量" |
| 269 | @blur="inputBlurMaxWeight($event)" | 267 | @blur="inputBlurMaxWeight($event)" |
| 270 | :disabled="!getRouter" | 268 | :disabled="!getRouter" |
| ... | @@ -278,7 +276,6 @@ | ... | @@ -278,7 +276,6 @@ |
| 278 | <el-col :span="10"> | 276 | <el-col :span="10"> |
| 279 | <el-input | 277 | <el-input |
| 280 | v-model.trim="queryForm.minNumOfPieces" | 278 | v-model.trim="queryForm.minNumOfPieces" |
| 281 | - clearable | ||
| 282 | placeholder="最少件数" | 279 | placeholder="最少件数" |
| 283 | @blur="inputBlurMinPieces($event)" | 280 | @blur="inputBlurMinPieces($event)" |
| 284 | :disabled="!getRouter" | 281 | :disabled="!getRouter" |
| ... | @@ -289,7 +286,6 @@ | ... | @@ -289,7 +286,6 @@ |
| 289 | <el-col :span="10"> | 286 | <el-col :span="10"> |
| 290 | <el-input | 287 | <el-input |
| 291 | v-model.trim="queryForm.maxNumOfPieces" | 288 | v-model.trim="queryForm.maxNumOfPieces" |
| 292 | - clearable | ||
| 293 | placeholder="最多件数" | 289 | placeholder="最多件数" |
| 294 | @blur="inputBlurMaxPieces($event)" | 290 | @blur="inputBlurMaxPieces($event)" |
| 295 | :disabled="!getRouter" | 291 | :disabled="!getRouter" |
| ... | @@ -309,7 +305,6 @@ | ... | @@ -309,7 +305,6 @@ |
| 309 | <el-col :span="10"> | 305 | <el-col :span="10"> |
| 310 | <el-input | 306 | <el-input |
| 311 | v-model.trim="minCNYCustomVal" | 307 | v-model.trim="minCNYCustomVal" |
| 312 | - clearable | ||
| 313 | placeholder="最小申报价值" | 308 | placeholder="最小申报价值" |
| 314 | @blur="inputBlurMin($event, 'minCNYCustomVal')" | 309 | @blur="inputBlurMin($event, 'minCNYCustomVal')" |
| 315 | :disabled="!getRouter" | 310 | :disabled="!getRouter" |
| ... | @@ -323,7 +318,6 @@ | ... | @@ -323,7 +318,6 @@ |
| 323 | <el-col :span="10"> | 318 | <el-col :span="10"> |
| 324 | <el-input | 319 | <el-input |
| 325 | v-model.trim="maxCNYCustomVal" | 320 | v-model.trim="maxCNYCustomVal" |
| 326 | - clearable | ||
| 327 | placeholder="最大申报价值" | 321 | placeholder="最大申报价值" |
| 328 | @blur="inputBlurMax($event, 'maxCNYCustomVal')" | 322 | @blur="inputBlurMax($event, 'maxCNYCustomVal')" |
| 329 | :disabled="!getRouter" | 323 | :disabled="!getRouter" |
| ... | @@ -336,7 +330,6 @@ | ... | @@ -336,7 +330,6 @@ |
| 336 | <el-col :span="10"> | 330 | <el-col :span="10"> |
| 337 | <el-input | 331 | <el-input |
| 338 | v-model.trim="minSUDCustomVal" | 332 | v-model.trim="minSUDCustomVal" |
| 339 | - clearable | ||
| 340 | placeholder="最小申报价值" | 333 | placeholder="最小申报价值" |
| 341 | @blur="inputBlurMin($event, 'minSUDCustomVal')" | 334 | @blur="inputBlurMin($event, 'minSUDCustomVal')" |
| 342 | :disabled="!getRouter" | 335 | :disabled="!getRouter" |
| ... | @@ -350,7 +343,6 @@ | ... | @@ -350,7 +343,6 @@ |
| 350 | <el-col :span="10"> | 343 | <el-col :span="10"> |
| 351 | <el-input | 344 | <el-input |
| 352 | v-model.trim="maxSUDCustomVal" | 345 | v-model.trim="maxSUDCustomVal" |
| 353 | - clearable | ||
| 354 | placeholder="最大申报价值" | 346 | placeholder="最大申报价值" |
| 355 | @blur="inputBlurMax($event, 'maxSUDCustomVal')" | 347 | @blur="inputBlurMax($event, 'maxSUDCustomVal')" |
| 356 | :disabled="!getRouter" | 348 | :disabled="!getRouter" |
| ... | @@ -538,9 +530,9 @@ export default { | ... | @@ -538,9 +530,9 @@ export default { |
| 538 | Object.keys(data.list.fltRuleDto).map((key) => { | 530 | Object.keys(data.list.fltRuleDto).map((key) => { |
| 539 | if (key == "multiHs") { | 531 | if (key == "multiHs") { |
| 540 | if (data.list.fltRuleDto[key] == "N") { | 532 | if (data.list.fltRuleDto[key] == "N") { |
| 541 | - data.list.fltRuleDto[key] = false; | ||
| 542 | - } else { | ||
| 543 | data.list.fltRuleDto[key] = true; | 533 | data.list.fltRuleDto[key] = true; |
| 534 | + } else { | ||
| 535 | + data.list.fltRuleDto[key] = false; | ||
| 544 | } | 536 | } |
| 545 | } | 537 | } |
| 546 | // 将详情获取为null的字段设置为空字符串,目的是为了判断的时候少些为null的判断,保持空数据同一的判断条件; | 538 | // 将详情获取为null的字段设置为空字符串,目的是为了判断的时候少些为null的判断,保持空数据同一的判断条件; |
| ... | @@ -548,6 +540,11 @@ export default { | ... | @@ -548,6 +540,11 @@ export default { |
| 548 | data.list.fltRuleDto[key] = ""; | 540 | data.list.fltRuleDto[key] = ""; |
| 549 | } | 541 | } |
| 550 | }); | 542 | }); |
| 543 | + if(data.list.fltRuleDto.declarationCategory){ | ||
| 544 | + this.checkboxClassType = data.list.fltRuleDto.declarationCategory.split(';'); | ||
| 545 | + }else{ | ||
| 546 | + this.checkboxClassType = [] | ||
| 547 | + } | ||
| 551 | this.queryForm = data.list.fltRuleDto; // ET86配舱航班顺位维度 | 548 | this.queryForm = data.list.fltRuleDto; // ET86配舱航班顺位维度 |
| 552 | } else { | 549 | } else { |
| 553 | this.msgError(msg || "获取查看失败"); | 550 | this.msgError(msg || "获取查看失败"); |
| ... | @@ -743,11 +740,28 @@ export default { | ... | @@ -743,11 +740,28 @@ export default { |
| 743 | flightRankDtoList: tableData, // ET86配舱航班顺位 | 740 | flightRankDtoList: tableData, // ET86配舱航班顺位 |
| 744 | fltRuleDto: this.queryForm, | 741 | fltRuleDto: this.queryForm, |
| 745 | }; | 742 | }; |
| 746 | - parmas.fltRuleDto.multiHs = this.queryForm.multiHs ? "Y" : "N"; // N为单品名,Y为多品名 | 743 | + // 筛选重复的航班 |
| 747 | - if (this.$route.query.name == "add") { | 744 | + let repeat = tableData.filter( |
| 745 | + (item) => | ||
| 746 | + item.flightNo == tableData[this.currentIndex].flightNo && | ||
| 747 | + item.calculateDay == tableData[this.currentIndex].calculateDay && | ||
| 748 | + item.flightRoute == tableData[this.currentIndex].flightRoute | ||
| 749 | + ); | ||
| 750 | + if (tableData.length > 100) { | ||
| 751 | + this.msgError("最多添加100条,请删除后再添加"); | ||
| 752 | + return; | ||
| 753 | + } | ||
| 754 | + if (repeat.length > 1) { | ||
| 755 | + this.msgError("ET86配舱航班顺位中存在重复设置"); | ||
| 756 | + return; | ||
| 757 | + } | ||
| 758 | + parmas.fltRuleDto.multiHs = this.queryForm.multiHs ? "N" : "Y"; // N为单品名,Y为多品名 | ||
| 759 | + if (this.validateForm && this.$route.query.name == "add") { | ||
| 748 | this.postAdd(parmas); // 新增 | 760 | this.postAdd(parmas); // 新增 |
| 749 | } else { | 761 | } else { |
| 750 | - this.postUpdate(parmas); // 修改 | 762 | + if (this.validateForm) { |
| 763 | + this.postUpdate(parmas); // 修改 | ||
| 764 | + } | ||
| 751 | } | 765 | } |
| 752 | } else { | 766 | } else { |
| 753 | console.log("error submit!!"); | 767 | console.log("error submit!!"); | ... | ... |
| ... | @@ -5,8 +5,9 @@ export const formConfig = [ | ... | @@ -5,8 +5,9 @@ export const formConfig = [ |
| 5 | name: "originOfFlightNo", | 5 | name: "originOfFlightNo", |
| 6 | prop: "originOfFlightNo", | 6 | prop: "originOfFlightNo", |
| 7 | placeholder: "请输入原航班号", | 7 | placeholder: "请输入原航班号", |
| 8 | - span: 6, | 8 | + span: 5, |
| 9 | trigger: "blur", | 9 | trigger: "blur", |
| 10 | + labelWidth: "55px", | ||
| 10 | }, | 11 | }, |
| 11 | { | 12 | { |
| 12 | label: "修改时间 从", | 13 | label: "修改时间 从", |
| ... | @@ -16,7 +17,7 @@ export const formConfig = [ | ... | @@ -16,7 +17,7 @@ export const formConfig = [ |
| 16 | placeholder: "请选择开始时间", | 17 | placeholder: "请选择开始时间", |
| 17 | // rules: { required: true, message: "请选择开始时间", trigger: "blur" }, | 18 | // rules: { required: true, message: "请选择开始时间", trigger: "blur" }, |
| 18 | format: "yyyy-MM-dd", | 19 | format: "yyyy-MM-dd", |
| 19 | - colWidth: "25%", | 20 | + colWidth: "23%", |
| 20 | inputWidth: "100%", | 21 | inputWidth: "100%", |
| 21 | }, | 22 | }, |
| 22 | { | 23 | { |
| ... | @@ -27,7 +28,7 @@ export const formConfig = [ | ... | @@ -27,7 +28,7 @@ export const formConfig = [ |
| 27 | placeholder: "请选择结束时间", | 28 | placeholder: "请选择结束时间", |
| 28 | // rules: { required: true, message: "请选择结束时间", trigger: "blur" }, | 29 | // rules: { required: true, message: "请选择结束时间", trigger: "blur" }, |
| 29 | format: "yyyy-MM-dd", | 30 | format: "yyyy-MM-dd", |
| 30 | - colWidth: "19%", | 31 | + colWidth: "20%", |
| 31 | labelWidth: "20px", | 32 | labelWidth: "20px", |
| 32 | inputWidth: "100%", | 33 | inputWidth: "100%", |
| 33 | }, | 34 | }, |
| ... | @@ -42,7 +43,8 @@ export const formConfig = [ | ... | @@ -42,7 +43,8 @@ export const formConfig = [ |
| 42 | { | 43 | { |
| 43 | value: "1", | 44 | value: "1", |
| 44 | label: "有效", | 45 | label: "有效", |
| 45 | - }, { | 46 | + }, |
| 47 | + { | ||
| 46 | value: "0", | 48 | value: "0", |
| 47 | label: "无效", | 49 | label: "无效", |
| 48 | }, | 50 | }, |
| ... | @@ -50,7 +52,7 @@ export const formConfig = [ | ... | @@ -50,7 +52,7 @@ export const formConfig = [ |
| 50 | label: "有效", | 52 | label: "有效", |
| 51 | value: "1", | 53 | value: "1", |
| 52 | }, | 54 | }, |
| 53 | - colWidth: "20%", | 55 | + colWidth: "18%", |
| 54 | labelWidth: "70px", | 56 | labelWidth: "70px", |
| 55 | inputWidth: "100%", | 57 | inputWidth: "100%", |
| 56 | }, | 58 | }, | ... | ... |
| ... | @@ -71,12 +71,27 @@ export default { | ... | @@ -71,12 +71,27 @@ export default { |
| 71 | }, | 71 | }, |
| 72 | mounted() { | 72 | mounted() { |
| 73 | this.$nextTick(() => { | 73 | this.$nextTick(() => { |
| 74 | - this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs); | 74 | + this.tableAttr.maxHeight = |
| 75 | + window.innerHeight - restTableHeight(this.$refs); | ||
| 75 | }); | 76 | }); |
| 76 | }, | 77 | }, |
| 77 | methods: { | 78 | methods: { |
| 78 | // ET86查询 | 79 | // ET86查询 |
| 79 | - queryFindAllEtesRules(params) { | 80 | + queryFindAllEtesRules() { |
| 81 | + const { page, size } = this.pageConfig.pageData; | ||
| 82 | + let params = { | ||
| 83 | + originOfFlightNo: this.queryForm.originOfFlightNo, | ||
| 84 | + updateTimeStart: this.queryForm.startTime | ||
| 85 | + ? this.queryForm.startTime | ||
| 86 | + : "", | ||
| 87 | + updateTimeEnd: this.queryForm.endTime ? this.queryForm.endTime : "", | ||
| 88 | + limitStart: (page - 1) * size, | ||
| 89 | + limitSize: size, | ||
| 90 | + status: this.queryForm.status, | ||
| 91 | + }; | ||
| 92 | + if (this.queryForm.status == "有效") { | ||
| 93 | + params.status = "1"; | ||
| 94 | + } | ||
| 80 | this.tableAttr.loadingTable = true; | 95 | this.tableAttr.loadingTable = true; |
| 81 | findAllEtesRules(params) | 96 | findAllEtesRules(params) |
| 82 | .then((res) => { | 97 | .then((res) => { |
| ... | @@ -101,34 +116,22 @@ export default { | ... | @@ -101,34 +116,22 @@ export default { |
| 101 | }, | 116 | }, |
| 102 | // 搜索 | 117 | // 搜索 |
| 103 | searchBtn() { | 118 | searchBtn() { |
| 104 | - const { page, size } = this.pageConfig.pageData; | 119 | + this.pageConfig.pageData.page = 1; |
| 105 | - let params = { | 120 | + this.pageConfig.pageData.size = 10; |
| 106 | - originOfFlightNo: this.queryForm.originOfFlightNo, | ||
| 107 | - updateTimeStart: this.queryForm.startTime | ||
| 108 | - ? this.queryForm.startTime | ||
| 109 | - : "", | ||
| 110 | - updateTimeEnd: this.queryForm.endTime ? this.queryForm.endTime : "", | ||
| 111 | - limitStart: (page - 1) * size, | ||
| 112 | - limitSize: size, | ||
| 113 | - status: this.queryForm.status, | ||
| 114 | - }; | ||
| 115 | - if (this.queryForm.status == "有效") { | ||
| 116 | - params.status = "1"; | ||
| 117 | - } | ||
| 118 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { | 121 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { |
| 119 | - this.queryFindAllEtesRules(params); | 122 | + this.queryFindAllEtesRules(); |
| 120 | }); | 123 | }); |
| 121 | }, | 124 | }, |
| 122 | //条数变化 | 125 | //条数变化 |
| 123 | handleSizeChange(e) { | 126 | handleSizeChange(e) { |
| 124 | this.pageConfig.pageData.size = e; | 127 | this.pageConfig.pageData.size = e; |
| 125 | this.pageConfig.pageData.page = 1; | 128 | this.pageConfig.pageData.page = 1; |
| 126 | - this.searchBtn(); | 129 | + this.queryFindAllEtesRules(); |
| 127 | }, | 130 | }, |
| 128 | //页码变化 | 131 | //页码变化 |
| 129 | handleCurrentChange(e) { | 132 | handleCurrentChange(e) { |
| 130 | this.pageConfig.pageData.page = e; | 133 | this.pageConfig.pageData.page = e; |
| 131 | - this.searchBtn(); | 134 | + this.queryFindAllEtesRules(); |
| 132 | }, | 135 | }, |
| 133 | // 添加 | 136 | // 添加 |
| 134 | addBtn(item) { | 137 | addBtn(item) { |
| ... | @@ -167,7 +170,7 @@ export default { | ... | @@ -167,7 +170,7 @@ export default { |
| 167 | }, | 170 | }, |
| 168 | // 删除 | 171 | // 删除 |
| 169 | deleteRow({ row }) { | 172 | deleteRow({ row }) { |
| 170 | - this.$confirm("是否确认删除?", "提示", { | 173 | + this.$confirm("是否确认删除? 删除后该规则设置为无效,不可恢复", "提示", { |
| 171 | confirmButtonText: "确定", | 174 | confirmButtonText: "确定", |
| 172 | cancelButtonText: "取消", | 175 | cancelButtonText: "取消", |
| 173 | type: "warning", | 176 | type: "warning", | ... | ... |
| ... | @@ -50,19 +50,19 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -50,19 +50,19 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 50 | label: "配载航班", | 50 | label: "配载航班", |
| 51 | prop: "rankFltNoStr", | 51 | prop: "rankFltNoStr", |
| 52 | align: "center", | 52 | align: "center", |
| 53 | - minWidth: 100, | 53 | + minWidth: 120, |
| 54 | }, | 54 | }, |
| 55 | { | 55 | { |
| 56 | label: "航线", | 56 | label: "航线", |
| 57 | prop: "rankFltRouteStr", | 57 | prop: "rankFltRouteStr", |
| 58 | align: "center", | 58 | align: "center", |
| 59 | - minWidth: 100, | 59 | + minWidth: 140, |
| 60 | }, | 60 | }, |
| 61 | { | 61 | { |
| 62 | label: "状态", | 62 | label: "状态", |
| 63 | prop: "status", | 63 | prop: "status", |
| 64 | align: "center", | 64 | align: "center", |
| 65 | - minWidth: 80, | 65 | + minWidth: 50, |
| 66 | render: (h, params) => { | 66 | render: (h, params) => { |
| 67 | const { row } = params; | 67 | const { row } = params; |
| 68 | return h("div", `${state[row.status]}`); | 68 | return h("div", `${state[row.status]}`); |
| ... | @@ -72,7 +72,7 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -72,7 +72,7 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 72 | label: "修改时间", | 72 | label: "修改时间", |
| 73 | prop: "updateTime", | 73 | prop: "updateTime", |
| 74 | align: "center", | 74 | align: "center", |
| 75 | - minWidth: 120, | 75 | + minWidth: 80, |
| 76 | // sortable: true, | 76 | // sortable: true, |
| 77 | // "sort-method": (a, b) => a.createTime - b.createTime, | 77 | // "sort-method": (a, b) => a.createTime - b.createTime, |
| 78 | }, | 78 | }, |
| ... | @@ -80,13 +80,13 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ | ... | @@ -80,13 +80,13 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [ |
| 80 | label: "修改人", | 80 | label: "修改人", |
| 81 | prop: "updateUserName", | 81 | prop: "updateUserName", |
| 82 | align: "center", | 82 | align: "center", |
| 83 | - minWidth: 80, | 83 | + minWidth: 60, |
| 84 | }, | 84 | }, |
| 85 | { | 85 | { |
| 86 | label: "操作", | 86 | label: "操作", |
| 87 | prop: "operate", | 87 | prop: "operate", |
| 88 | align: "center", | 88 | align: "center", |
| 89 | - minWidth: 125, | 89 | + minWidth: 90, |
| 90 | fixed: "right", | 90 | fixed: "right", |
| 91 | render: (h, params) => { | 91 | render: (h, params) => { |
| 92 | let operateData = [] | 92 | let operateData = [] | ... | ... |
| ... | @@ -115,7 +115,7 @@ export default { | ... | @@ -115,7 +115,7 @@ export default { |
| 115 | }, | 115 | }, |
| 116 | rules: { | 116 | rules: { |
| 117 | skuName: [ | 117 | skuName: [ |
| 118 | - { required: true, message: "请输入商品名称", trigger: "blur" }, | 118 | + { required: true, message: "请输入ShipmentDesc", trigger: "blur" }, |
| 119 | ], | 119 | ], |
| 120 | }, | 120 | }, |
| 121 | pageConfig: { | 121 | pageConfig: { |
| ... | @@ -141,12 +141,19 @@ export default { | ... | @@ -141,12 +141,19 @@ export default { |
| 141 | }, | 141 | }, |
| 142 | mounted() { | 142 | mounted() { |
| 143 | this.$nextTick(() => { | 143 | this.$nextTick(() => { |
| 144 | - this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs); | 144 | + this.tableAttr.maxHeight = |
| 145 | + window.innerHeight - restTableHeight(this.$refs); | ||
| 145 | }); | 146 | }); |
| 146 | }, | 147 | }, |
| 147 | methods: { | 148 | methods: { |
| 148 | // HScode黑名单查询 | 149 | // HScode黑名单查询 |
| 149 | - queryFindHsCodeList(params) { | 150 | + queryFindHsCodeList() { |
| 151 | + const { page, size } = this.pageConfig.pageData; | ||
| 152 | + let params = { | ||
| 153 | + limitStart: (page - 1) * size, | ||
| 154 | + limitSize: size, | ||
| 155 | + ...this.queryForm, | ||
| 156 | + }; | ||
| 150 | this.tableAttr.loadingTable = true; | 157 | this.tableAttr.loadingTable = true; |
| 151 | findHsCodeList(params) | 158 | findHsCodeList(params) |
| 152 | .then((res) => { | 159 | .then((res) => { |
| ... | @@ -205,14 +212,10 @@ export default { | ... | @@ -205,14 +212,10 @@ export default { |
| 205 | }, | 212 | }, |
| 206 | // 搜索 | 213 | // 搜索 |
| 207 | searchBtn() { | 214 | searchBtn() { |
| 208 | - const { page, size } = this.pageConfig.pageData; | 215 | + this.pageConfig.pageData.page = 1; |
| 216 | + this.pageConfig.pageData.size = 10; | ||
| 209 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { | 217 | this.$refs.ruleForm.handleSearch("ruleForm", (val) => { |
| 210 | - let params = { | 218 | + this.queryFindHsCodeList(); |
| 211 | - limitStart: (page - 1) * size, | ||
| 212 | - limitSize: size, | ||
| 213 | - ...this.queryForm, | ||
| 214 | - }; | ||
| 215 | - this.queryFindHsCodeList(params); | ||
| 216 | }); | 219 | }); |
| 217 | }, | 220 | }, |
| 218 | // 确认对话框 | 221 | // 确认对话框 |
| ... | @@ -277,12 +280,12 @@ export default { | ... | @@ -277,12 +280,12 @@ export default { |
| 277 | handleSizeChange(e) { | 280 | handleSizeChange(e) { |
| 278 | this.pageConfig.pageData.size = e; | 281 | this.pageConfig.pageData.size = e; |
| 279 | this.pageConfig.pageData.page = 1; | 282 | this.pageConfig.pageData.page = 1; |
| 280 | - this.searchBtn(); | 283 | + this.queryFindHsCodeList(); |
| 281 | }, | 284 | }, |
| 282 | //页码变化 | 285 | //页码变化 |
| 283 | handleCurrentChange(e) { | 286 | handleCurrentChange(e) { |
| 284 | this.pageConfig.pageData.page = e; | 287 | this.pageConfig.pageData.page = e; |
| 285 | - this.searchBtn(); | 288 | + this.queryFindHsCodeList(); |
| 286 | }, | 289 | }, |
| 287 | // table勾选 | 290 | // table勾选 |
| 288 | tableSelectionChange(val) { | 291 | tableSelectionChange(val) { | ... | ... |
| ... | @@ -27,7 +27,7 @@ export const tableAttr = { | ... | @@ -27,7 +27,7 @@ export const tableAttr = { |
| 27 | { | 27 | { |
| 28 | type: "primary", | 28 | type: "primary", |
| 29 | icon: "el-icon-upload", | 29 | icon: "el-icon-upload", |
| 30 | - btnName: "增加", | 30 | + btnName: "导入", |
| 31 | size: "mini", | 31 | size: "mini", |
| 32 | round: false, | 32 | round: false, |
| 33 | loading: false, | 33 | loading: false, | ... | ... |
-
Please register or login to post a comment