Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
c3c02bd9 1 parent eb6b4739

黑名单导出增加，文本修正，bug修复

Inline Side-by-side
Showing 9 changed files with 96 additions and 62 deletions
...@@ -55,10 +55,11 @@ export function searchGoods(data) { ...@@ -55,10 +55,11 @@ export function searchGoods(data) {
55 //查询货站 55 //查询货站
56 /** 56 /**
57 */ 57 */
58 -export function findStationName() { 58 +export function findStationName(data) {
59 return request({ 59 return request({
60 url: '/goods/findStationName', 60 url: '/goods/findStationName',
61 method: 'post', 61 method: 'post',
62 + data: data
62 }) 63 })
63 } 64 }
64 65
......
...@@ -2112,6 +2112,13 @@ let tableHeaders = { ...@@ -2112,6 +2112,13 @@ let tableHeaders = {
2112 status: 1 2112 status: 1
2113 }, 2113 },
2114 { 2114 {
2115 + columnChineseName: "导入来源",
2116 + columnName: "module",
2117 + columnWidth: "",
2118 + ext1: "",
2119 + status: 1
2120 + },
2121 + {
2115 columnChineseName: "货站名称", 2122 columnChineseName: "货站名称",
2116 columnName: "ext", 2123 columnName: "ext",
2117 columnWidth: "", 2124 columnWidth: "",
......
...@@ -91,7 +91,7 @@ export const constantRoutes = [ ...@@ -91,7 +91,7 @@ export const constantRoutes = [
91 meta: { title: '错误信息提示', icon: 'user' } 91 meta: { title: '错误信息提示', icon: 'user' }
92 }, 92 },
93 { 93 {
94 - path: '/goodsLog', 94 + path: '/goodsLog/type=:type',
95 component: (resolve) => require(['@/views/basicInformation/goodsStation/goodsUploadLog'], resolve), 95 component: (resolve) => require(['@/views/basicInformation/goodsStation/goodsUploadLog'], resolve),
96 name: 'GoodsUploadLog', 96 name: 'GoodsUploadLog',
97 meta: { title: '导入日志', icon: 'user' } 97 meta: { title: '导入日志', icon: 'user' }
......
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
126 //查询货站 126 //查询货站
127 getgoods() { 127 getgoods() {
128 this.goodsStationLoading = true 128 this.goodsStationLoading = true
129 - findStationName().then(res => { 129 + findStationName({ goodsType: 2 }).then(res => {
130 this.goodsStationLoading = false 130 this.goodsStationLoading = false
131 if (res.code === 200) { 131 if (res.code === 200) {
132 this.goodsStationList = res.data.list 132 this.goodsStationList = res.data.list
...@@ -221,8 +221,8 @@ export default { ...@@ -221,8 +221,8 @@ export default {
221 this.$refs['addForm'].validate(val => { 221 this.$refs['addForm'].validate(val => {
222 if (val) { 222 if (val) {
223 this.downloading = true 223 this.downloading = true
224 - let data = { goodsStation: this.formData.goodsStation } 224 + let data = { goodsStation: this.formData.goodsStation, goodsType: 2 }
225 - downLoadXlsx("/goods/exportGoods", data, "货站表") 225 + downLoadXlsx("/goods/exportGoods", data, "黑名单货站表")
226 .then(() => { 226 .then(() => {
227 this.downloading = false 227 this.downloading = false
228 this.close() 228 this.close()
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
30 <el-button type="primary" icon="el-icon-download" size="small" style="margin-left:10px" 30 <el-button type="primary" icon="el-icon-download" size="small" style="margin-left:10px"
31 @click="downloadTempleate">下载模板 31 @click="downloadTempleate">下载模板
32 </el-button> 32 </el-button>
33 - <!-- <el-button icon="el-icon-download" type="primary" size="small" style="margin-left:10px" 33 + <el-button icon="el-icon-download" type="primary" size="small" style="margin-left:10px"
34 @click="downloadExcel"> 34 @click="downloadExcel">
35 黑名单导出 35 黑名单导出
36 - </el-button> --> 36 + </el-button>
37 <el-button type="primary" icon="el-icon-upload2" size="small" @click="uploadExcel" 37 <el-button type="primary" icon="el-icon-upload2" size="small" @click="uploadExcel"
38 v-hasPermi="['base:goodsBlackStation:add']">黑名单导入</el-button> 38 v-hasPermi="['base:goodsBlackStation:add']">黑名单导入</el-button>
39 <el-button icon="el-icon-document" type="primary" size="small" @click="selectLog()">查询导入日志 39 <el-button icon="el-icon-document" type="primary" size="small" @click="selectLog()">查询导入日志
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
199 if (res) { 199 if (res) {
200 const blob = new Blob([res]); 200 const blob = new Blob([res]);
201 const link = document.createElement("a"); //创建a标签 201 const link = document.createElement("a"); //创建a标签
202 - link.download = '货物品名模板.xlsx'; //a标签添加属性 202 + link.download = '黑名单货物品名模板.xlsx'; //a标签添加属性
203 link.style.display = "none"; 203 link.style.display = "none";
204 link.href = URL.createObjectURL(blob); 204 link.href = URL.createObjectURL(blob);
205 document.body.appendChild(link); 205 document.body.appendChild(link);
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
226 this.uploadExcel(file); 226 this.uploadExcel(file);
227 }, 227 },
228 selectLog() { 228 selectLog() {
229 - this.$router.push({ name: 'GoodsUploadLog' }) 229 + this.$router.push({ name: 'GoodsUploadLog', params: { type: 2 } })
230 }, 230 },
231 close() { 231 close() {
232 this.open = false 232 this.open = false
......
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
126 //查询货站 126 //查询货站
127 getgoods() { 127 getgoods() {
128 this.goodsStationLoading = true 128 this.goodsStationLoading = true
129 - findStationName().then(res => { 129 + findStationName({ goodsType: 1 }).then(res => {
130 this.goodsStationLoading = false 130 this.goodsStationLoading = false
131 if (res.code === 200) { 131 if (res.code === 200) {
132 this.goodsStationList = res.data.list 132 this.goodsStationList = res.data.list
...@@ -221,8 +221,8 @@ export default { ...@@ -221,8 +221,8 @@ export default {
221 this.$refs['addForm'].validate(val => { 221 this.$refs['addForm'].validate(val => {
222 if (val) { 222 if (val) {
223 this.downloading = true 223 this.downloading = true
224 - let data = { goodsStation: this.formData.goodsStation } 224 + let data = { goodsStation: this.formData.goodsStation, goodsType: 1 }
225 - downLoadXlsx("/goods/exportGoods", data, "货站表") 225 + downLoadXlsx("/goods/exportGoods", data, "白名单货站表")
226 .then(() => { 226 .then(() => {
227 this.downloading = false 227 this.downloading = false
228 this.close() 228 this.close()
......
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
43 methods: { 43 methods: {
44 //日志查询 44 //日志查询
45 selectLog(val) { 45 selectLog(val) {
46 + this.logTabelData = []
46 if (val === 1) { 47 if (val === 1) {
47 this.logData.page = 1 48 this.logData.page = 1
48 } 49 }
...@@ -50,8 +51,14 @@ export default { ...@@ -50,8 +51,14 @@ export default {
50 userImportLog(this.logData).then(res => { 51 userImportLog(this.logData).then(res => {
51 this.loading = false 52 this.loading = false
52 if (res.code === 200) { 53 if (res.code === 200) {
53 - this.logCount = res.data.total 54 + res.data.list.forEach(item => {
54 - this.logTabelData = res.data.list 55 + if (this.$route.params.type == 1 && item.module == '白名单导入') {
56 + this.logTabelData.push(item)
57 + } else if (this.$route.params.type == 2 && item.module == '黑名单导入') {
58 + this.logTabelData.push(item)
59 + }
60 + })
61 + this.logCount = this.logTabelData.length
55 } else { 62 } else {
56 this.msgWarning(res.msg) 63 this.msgWarning(res.msg)
57 } 64 }
......
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
199 if (res) { 199 if (res) {
200 const blob = new Blob([res]); 200 const blob = new Blob([res]);
201 const link = document.createElement("a"); //创建a标签 201 const link = document.createElement("a"); //创建a标签
202 - link.download = '货物品名模板.xlsx'; //a标签添加属性 202 + link.download = '白名单货物品名模板.xlsx'; //a标签添加属性
203 link.style.display = "none"; 203 link.style.display = "none";
204 link.href = URL.createObjectURL(blob); 204 link.href = URL.createObjectURL(blob);
205 document.body.appendChild(link); 205 document.body.appendChild(link);
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
226 this.uploadExcel(file); 226 this.uploadExcel(file);
227 }, 227 },
228 selectLog() { 228 selectLog() {
229 - this.$router.push({ name: 'GoodsUploadLog' }) 229 + this.$router.push({ name: 'GoodsUploadLog', params: { type: 1 } })
230 }, 230 },
231 close() { 231 close() {
232 this.open = false 232 this.open = false
......
...@@ -150,11 +150,17 @@ ...@@ -150,11 +150,17 @@
150 <el-col :span="6"> 150 <el-col :span="6">
151 <el-form-item label="预审状态"> 151 <el-form-item label="预审状态">
152 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple> 152 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
153 - <el-option v-for="item in findConditionData.preQualificationStatus" 153 + <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
154 - :label="item == '' ? '非预审' : item" :value="item"> </el-option> 154 + :value="item"> </el-option>
155 </el-select> 155 </el-select>
156 </el-form-item> 156 </el-form-item>
157 </el-col> 157 </el-col>
158 + <el-col :span="6">
159 + <el-form-item label="发件人账号">
160 + <el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
161 + placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
162 + </el-form-item>
163 + </el-col>
158 </el-row> 164 </el-row>
159 </el-col> 165 </el-col>
160 </el-row> 166 </el-row>
...@@ -259,6 +265,7 @@ export default { ...@@ -259,6 +265,7 @@ export default {
259 typeId: null, 265 typeId: null,
260 statusId: null, 266 statusId: null,
261 serviceTypeId: null, 267 serviceTypeId: null,
268 + shipperAccount: null,
262 allocationTypeId: null, 269 allocationTypeId: null,
263 kindToAllocFlightId: null, 270 kindToAllocFlightId: null,
264 historyAllocaCargoTypeId: null, 271 historyAllocaCargoTypeId: null,
...@@ -362,13 +369,14 @@ export default { ...@@ -362,13 +369,14 @@ export default {
362 } else { 369 } else {
363 this.tableHeader = this.tableHeaders['cargo'] 370 this.tableHeader = this.tableHeaders['cargo']
364 } 371 }
365 - this.select(0) 372 + // this.select(0,'create')
366 }, 373 },
367 374
368 activated() { 375 activated() {
369 this.selectTable = [] 376 this.selectTable = []
370 this.cargoTotal() 377 this.cargoTotal()
371 if (this.$route.params.fltNo) { 378 if (this.$route.params.fltNo) {
379 + console.log(1)
372 //判断进入页面是否带参，确定是否是index跳转 380 //判断进入页面是否带参，确定是否是index跳转
373 this.formData = { 381 this.formData = {
374 fltDateStart: "", 382 fltDateStart: "",
...@@ -387,6 +395,8 @@ export default { ...@@ -387,6 +395,8 @@ export default {
387 typeId: null, 395 typeId: null,
388 statusId: null, 396 statusId: null,
389 serviceTypeId: null, 397 serviceTypeId: null,
398 + shipperAccount: null,
399 + shipperAccountList: null,
390 allocationTypeId: null, 400 allocationTypeId: null,
391 kindToAllocFlightId: null, 401 kindToAllocFlightId: null,
392 historyAllocaCargoTypeId: null, 402 historyAllocaCargoTypeId: null,
...@@ -399,20 +409,21 @@ export default { ...@@ -399,20 +409,21 @@ export default {
399 limitStart: 1, 409 limitStart: 1,
400 limitSize: 100, 410 limitSize: 100,
401 } 411 }
412 + console.log(this.$route)
402 this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate] 413 this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate]
403 this.formData.cargoPlaneStart = this.$route.params.fltDate 414 this.formData.cargoPlaneStart = this.$route.params.fltDate
404 this.formData.cargoPlaneEnd = this.$route.params.fltDate 415 this.formData.cargoPlaneEnd = this.$route.params.fltDate
405 this.formData.cargoPlaneNo = this.$route.params.fltNo 416 this.formData.cargoPlaneNo = this.$route.params.fltNo
406 this.formData.cargoPlaneRoute = this.$route.params.route 417 this.formData.cargoPlaneRoute = this.$route.params.route
407 - this.planeNoChange(this.formData.cargoPlaneNo) 418 + this.planeNoChange(this.formData.cargoPlaneNo.split(';'))
408 - this.select(0) 419 + this.select(0, 'activated')
409 } else { 420 } else {
410 //否则请求原页面缓存状态 421 //否则请求原页面缓存状态
411 if (this.$store.state.tagsView.cachedViews.length > 0) { 422 if (this.$store.state.tagsView.cachedViews.length > 0) {
412 this.$store.state.tagsView.cachedViews.forEach(item => { 423 this.$store.state.tagsView.cachedViews.forEach(item => {
413 if (item === 'QueryCargo') { 424 if (item === 'QueryCargo') {
414 this.findCondition() 425 this.findCondition()
415 - this.totalCount > 0 ? this.select() : '' 426 + this.select()
416 } 427 }
417 }) 428 })
418 } 429 }
...@@ -439,44 +450,46 @@ export default { ...@@ -439,44 +450,46 @@ export default {
439 watch: { 450 watch: {
440 $route: { 451 $route: {
441 handler(to, from) { 452 handler(to, from) {
442 - if (to.name === 'Index') { 453 + // if (to.name === 'Index') {
443 - this.formData = { 454 + // this.formData = {
444 - fltDateStart: "", 455 + // fltDateStart: "",
445 - fltDateEnd: "", 456 + // fltDateEnd: "",
446 - prematchFltDateStart: "", 457 + // prematchFltDateStart: "",
447 - prematchFltDateEnd: "", 458 + // prematchFltDateEnd: "",
448 - createTimeStart: null, 459 + // createTimeStart: null,
449 - createTimeEnd: null, 460 + // createTimeEnd: null,
450 - pickUpDate: null, 461 + // pickUpDate: null,
451 - hasFlight: null, 462 + // hasFlight: null,
452 - waybillNo: "", 463 + // waybillNo: "",
453 - siteName: "", 464 + // siteName: "",
454 - fltNo: "", 465 + // fltNo: "",
455 - mawbCode: "", 466 + // mawbCode: "",
456 - ursa: "", 467 + // ursa: "",
457 - typeId: null, 468 + // typeId: null,
458 - statusId: null, 469 + // statusId: null,
459 - serviceTypeId: null, 470 + // serviceTypeId: null,
460 - allocationTypeId: null, 471 + // shipperAccount: null,
461 - kindToAllocFlightId: null, 472 + // shipperAccountList: null,
462 - historyAllocaCargoTypeId: null, 473 + // allocationTypeId: null,
463 - dataSources: "", 474 + // kindToAllocFlightId: null,
464 - customsReceiptStatusId: null, 475 + // historyAllocaCargoTypeId: null,
465 - big: null, 476 + // dataSources: "",
466 - cargoPlaneNo: null, 477 + // customsReceiptStatusId: null,
467 - cargoPlaneStart: null, 478 + // big: null,
468 - cargoPlaneEnd: null, 479 + // cargoPlaneNo: null,
469 - limitStart: 1, 480 + // cargoPlaneStart: null,
470 - limitSize: 100, 481 + // cargoPlaneEnd: null,
471 - } 482 + // limitStart: 1,
472 - this.cargoPlaneTime = [from.params.fltDate, from.params.fltDate] 483 + // limitSize: 100,
473 - this.formData.cargoPlaneStart = from.params.fltDate 484 + // }
474 - this.formData.cargoPlaneEnd = from.params.fltDate 485 + // this.cargoPlaneTime = [from.params.fltDate, from.params.fltDate]
475 - this.formData.cargoPlaneNo = from.params.fltNo 486 + // this.formData.cargoPlaneStart = from.params.fltDate
476 - this.formData.cargoPlaneRoute = from.params.route 487 + // this.formData.cargoPlaneEnd = from.params.fltDate
477 - this.planeNoChange(this.formData.cargoPlaneNo) 488 + // this.formData.cargoPlaneNo = from.params.fltNo
478 - this.select(0) 489 + // this.formData.cargoPlaneRoute = from.params.route
479 - } 490 + // this.planeNoChange(this.formData.cargoPlaneNo)
491 + // this.select(0, 'watch')
492 + // }
480 } 493 }
481 }, 494 },
482 formShow(val, oldVal) { 495 formShow(val, oldVal) {
...@@ -498,7 +511,7 @@ export default { ...@@ -498,7 +511,7 @@ export default {
498 }); 511 });
499 }, 512 },
500 //查询 513 //查询
501 - async select(val) { 514 + async select(val, type) {
502 this.selectTable = [] 515 this.selectTable = []
503 this.tableData = []; 516 this.tableData = [];
504 this.allWeight = 0; 517 this.allWeight = 0;
...@@ -642,6 +655,12 @@ export default { ...@@ -642,6 +655,12 @@ export default {
642 if (this.formData.hasFlight == "") { 655 if (this.formData.hasFlight == "") {
643 this.formData.hasFlight = null 656 this.formData.hasFlight = null
644 } 657 }
658 + if (this.formData.shipperAccount != null && this.formData.shipperAccount != '') {
659 + this.formData.shipperAccountList = this.formData.shipperAccount.split(';')
660 + } else {
661 + this.formData.shipperAccountList = null
662 + }
663 +
645 this.formData.limitStart = this.limitStart; 664 this.formData.limitStart = this.limitStart;
646 this.formData.limitSize = 100; 665 this.formData.limitSize = 100;
647 }, 666 },
...@@ -677,7 +696,7 @@ export default { ...@@ -677,7 +696,7 @@ export default {
677 }, 696 },
678 //配载航班号获取航线 697 //配载航班号获取航线
679 planeNoChange(val) { 698 planeNoChange(val) {
680 - getFlightsRoutes(val.split(';')).then(res => { 699 + getFlightsRoutes(val).then(res => {
681 if (res.code === 200) { 700 if (res.code === 200) {
682 this.routeList = res.data 701 this.routeList = res.data
683 } else { 702 } else {
......