Merge remote-tracking branch 'origin/master'
正在显示
3 个修改的文件
包含
22 行增加
和
6 行删除
src/views/excel/excel.xls
0 → 100644
不能预览此文件类型
| @@ -312,7 +312,7 @@ | @@ -312,7 +312,7 @@ | ||
| 312 | </el-table-column> | 312 | </el-table-column> |
| 313 | <el-table-column label="操作人" width="100"> | 313 | <el-table-column label="操作人" width="100"> |
| 314 | <template slot-scope="scope"> | 314 | <template slot-scope="scope"> |
| 315 | - {{scope.row.operusername}} | 315 | + {{scope.row.opersystemname}} |
| 316 | </template> | 316 | </template> |
| 317 | </el-table-column> | 317 | </el-table-column> |
| 318 | </el-table> | 318 | </el-table> |
| @@ -465,6 +465,9 @@ | @@ -465,6 +465,9 @@ | ||
| 465 | contactName: undefined, | 465 | contactName: undefined, |
| 466 | contactTel: undefined, | 466 | contactTel: undefined, |
| 467 | content: undefined, | 467 | content: undefined, |
| 468 | + user: { | ||
| 469 | + username : JSON.parse(sessionStorage.getItem('user')).username | ||
| 470 | + } | ||
| 468 | }, | 471 | }, |
| 469 | respModel: { | 472 | respModel: { |
| 470 | uuid: undefined, | 473 | uuid: undefined, |
| @@ -476,7 +479,7 @@ | @@ -476,7 +479,7 @@ | ||
| 476 | awba: undefined, | 479 | awba: undefined, |
| 477 | customCode: undefined, | 480 | customCode: undefined, |
| 478 | flightDate: undefined, | 481 | flightDate: undefined, |
| 479 | - awbh: '' | 482 | + awbh: '', |
| 480 | }, | 483 | }, |
| 481 | loadingDeleteRules: { | 484 | loadingDeleteRules: { |
| 482 | reason: [{required: true, message: '删除原因不能为空', trigger: 'blur'}], | 485 | reason: [{required: true, message: '删除原因不能为空', trigger: 'blur'}], |
| @@ -618,8 +621,12 @@ | @@ -618,8 +621,12 @@ | ||
| 618 | }, | 621 | }, |
| 619 | // 更新数据 | 622 | // 更新数据 |
| 620 | updateData() { | 623 | updateData() { |
| 624 | + let _this = this; | ||
| 621 | this.$refs.loadingFormData.validate(valid => { | 625 | this.$refs.loadingFormData.validate(valid => { |
| 622 | if (valid) { | 626 | if (valid) { |
| 627 | + _this.loadingModel.user= { | ||
| 628 | + username : JSON.parse(sessionStorage.getItem('user')).username | ||
| 629 | + } | ||
| 623 | updateMT4201(this.loadingModel).then(res => { | 630 | updateMT4201(this.loadingModel).then(res => { |
| 624 | if (res.data.count > 0) { | 631 | if (res.data.count > 0) { |
| 625 | this.dialogFormVisible = false | 632 | this.dialogFormVisible = false |
| @@ -644,6 +651,9 @@ | @@ -644,6 +651,9 @@ | ||
| 644 | if(row.awbh === null || row.awbh === undefined){ | 651 | if(row.awbh === null || row.awbh === undefined){ |
| 645 | row.awbh = '' | 652 | row.awbh = '' |
| 646 | } | 653 | } |
| 654 | + row.user = { | ||
| 655 | + username : JSON.parse(sessionStorage.getItem('user')).username | ||
| 656 | + } | ||
| 647 | sendCreateMt4201(row).then(res => { | 657 | sendCreateMt4201(row).then(res => { |
| 648 | if (res.data.count > 0) { | 658 | if (res.data.count > 0) { |
| 649 | Message.success(res.data.respMessage) | 659 | Message.success(res.data.respMessage) |
| @@ -669,7 +679,8 @@ | @@ -669,7 +679,8 @@ | ||
| 669 | awba: undefined, | 679 | awba: undefined, |
| 670 | customCode: undefined, | 680 | customCode: undefined, |
| 671 | flightDate: undefined, | 681 | flightDate: undefined, |
| 672 | - awbh: '' | 682 | + awbh: '', |
| 683 | + username: JSON.parse(sessionStorage.getItem('user')).username, | ||
| 673 | } | 684 | } |
| 674 | this.dialogDeleteVisible = true | 685 | this.dialogDeleteVisible = true |
| 675 | this.respModel.carrier = row.carrier | 686 | this.respModel.carrier = row.carrier |
| @@ -783,7 +794,10 @@ | @@ -783,7 +794,10 @@ | ||
| 783 | loadingtime: undefined, | 794 | loadingtime: undefined, |
| 784 | messageType: 'MT4201', | 795 | messageType: 'MT4201', |
| 785 | awbprice: undefined, | 796 | awbprice: undefined, |
| 786 | - awbweight: undefined | 797 | + awbweight: undefined, |
| 798 | + user: { | ||
| 799 | + username : JSON.parse(sessionStorage.getItem('user')).username, | ||
| 800 | + } | ||
| 787 | } | 801 | } |
| 788 | }, | 802 | }, |
| 789 | // 新增出港装载 弹框 | 803 | // 新增出港装载 弹框 |
| @@ -798,6 +812,7 @@ | @@ -798,6 +812,7 @@ | ||
| 798 | this.loadingModel.customcode = this.loadingQuery.customcode | 812 | this.loadingModel.customcode = this.loadingQuery.customcode |
| 799 | this.dialogStatus = 'create' | 813 | this.dialogStatus = 'create' |
| 800 | this.dialogFormVisible = true | 814 | this.dialogFormVisible = true |
| 815 | + | ||
| 801 | this.$nextTick(() => { | 816 | this.$nextTick(() => { |
| 802 | this.$refs.loadingFormData.clearValidate() | 817 | this.$refs.loadingFormData.clearValidate() |
| 803 | }) | 818 | }) |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | <el-col :span="24"> | 23 | <el-col :span="24"> |
| 24 | <div class="grid-content content">预配舱单查询</div> | 24 | <div class="grid-content content">预配舱单查询</div> |
| 25 | </el-col> | 25 | </el-col> |
| 26 | - <el-col :span="24"> | 26 | + <el-col :span="22"> |
| 27 | <div class="grid-content co"> | 27 | <div class="grid-content co"> |
| 28 | <el-col :span="1"> | 28 | <el-col :span="1"> |
| 29 | <div class="grid-content"></div> | 29 | <div class="grid-content"></div> |
| @@ -1627,6 +1627,7 @@ | @@ -1627,6 +1627,7 @@ | ||
| 1627 | uploadFile (item) { | 1627 | uploadFile (item) { |
| 1628 | const form = new FormData() | 1628 | const form = new FormData() |
| 1629 | form.append('file', item.file) | 1629 | form.append('file', item.file) |
| 1630 | + form.append("username", JSON.parse(sessionStorage.getItem('user')).username); | ||
| 1630 | uploadFileExcel(form).then(res =>{ | 1631 | uploadFileExcel(form).then(res =>{ |
| 1631 | if(res.data.count >0){ | 1632 | if(res.data.count >0){ |
| 1632 | Message.success(res.data.respMessage) | 1633 | Message.success(res.data.respMessage) |
| @@ -1635,7 +1636,7 @@ | @@ -1635,7 +1636,7 @@ | ||
| 1635 | Message.error(res.data.respMessage) | 1636 | Message.error(res.data.respMessage) |
| 1636 | } | 1637 | } |
| 1637 | }) | 1638 | }) |
| 1638 | - } | 1639 | + }, |
| 1639 | } | 1640 | } |
| 1640 | } | 1641 | } |
| 1641 | 1642 |
-
请 注册 或 登录 后发表评论