正在显示
3 个修改的文件
包含
20 行增加
和
17 行删除
| @@ -541,6 +541,7 @@ | @@ -541,6 +541,7 @@ | ||
| 541 | import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat' | 541 | import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat' |
| 542 | import loginUserInfo from '@/api/base' | 542 | import loginUserInfo from '@/api/base' |
| 543 | import {mapActions, mapGetters} from 'vuex' | 543 | import {mapActions, mapGetters} from 'vuex' |
| 544 | + import {loginedUserInfo} from "../../api/user"; | ||
| 544 | export default{ | 545 | export default{ |
| 545 | data(){ | 546 | data(){ |
| 546 | return{ | 547 | return{ |
| @@ -798,7 +799,7 @@ | @@ -798,7 +799,7 @@ | ||
| 798 | }, | 799 | }, |
| 799 | //发送分拨申请报 | 800 | //发送分拨申请报 |
| 800 | importSend(index,row){ | 801 | importSend(index,row){ |
| 801 | - const map = {'mt6202':row,'username':this.getUserInfoStore.username} | 802 | + const map = {'mt6202':row,'username':loginedUserInfo().username} |
| 802 | sendCreateMt6202(map).then(res=>{ | 803 | sendCreateMt6202(map).then(res=>{ |
| 803 | let response=res.data; | 804 | let response=res.data; |
| 804 | //console.log(res); | 805 | //console.log(res); |
| @@ -848,7 +849,7 @@ | @@ -848,7 +849,7 @@ | ||
| 848 | 'contactName':this.Udform.operperson, | 849 | 'contactName':this.Udform.operperson, |
| 849 | 'contactTel':this.Udform.opertel, | 850 | 'contactTel':this.Udform.opertel, |
| 850 | 'carrier':this.rows.carrier, | 851 | 'carrier':this.rows.carrier, |
| 851 | - 'username':this.getUserInfoStore.username} | 852 | + 'username':loginedUserInfo().username} |
| 852 | if(this.rows.turntype=='MT6202'){ | 853 | if(this.rows.turntype=='MT6202'){ |
| 853 | sendRemoveMt6202(map).then(res=>{ | 854 | sendRemoveMt6202(map).then(res=>{ |
| 854 | let response=res.data; | 855 | let response=res.data; |
| @@ -898,7 +899,7 @@ | @@ -898,7 +899,7 @@ | ||
| 898 | //发送分拨运抵报 | 899 | //发送分拨运抵报 |
| 899 | arriveSend(index,row){ | 900 | arriveSend(index,row){ |
| 900 | 901 | ||
| 901 | - const map = {'mt3202':row,'username':this.getUserInfoStore.username} | 902 | + const map = {'mt3202':row,'username':loginedUserInfo().username} |
| 902 | sendCreateMt3202(map).then(res=>{ | 903 | sendCreateMt3202(map).then(res=>{ |
| 903 | let response=res.data; | 904 | let response=res.data; |
| 904 | //console.log(res); | 905 | //console.log(res); |
| @@ -738,6 +738,7 @@ | @@ -738,6 +738,7 @@ | ||
| 738 | import htmlToPdf from "../../api/htmlToPdf"; | 738 | import htmlToPdf from "../../api/htmlToPdf"; |
| 739 | import loginUserInfo from '@/api/base.js' | 739 | import loginUserInfo from '@/api/base.js' |
| 740 | import {mapActions, mapGetters} from 'vuex' | 740 | import {mapActions, mapGetters} from 'vuex' |
| 741 | + import {loginedUserInfo} from "../../api/user"; | ||
| 741 | export default { | 742 | export default { |
| 742 | data() { | 743 | data() { |
| 743 | /*初始数据*/ | 744 | /*初始数据*/ |
| @@ -749,7 +750,7 @@ | @@ -749,7 +750,7 @@ | ||
| 749 | destinationstation: undefined, | 750 | destinationstation: undefined, |
| 750 | awba: undefined | 751 | awba: undefined |
| 751 | }, | 752 | }, |
| 752 | - LoginUserInfo: loginUserInfo, | 753 | + LoginUserInfo: loginedUserInfo(), |
| 753 | FenQuery:{ | 754 | FenQuery:{ |
| 754 | flightno: undefined, | 755 | flightno: undefined, |
| 755 | flightdate: undefined, | 756 | flightdate: undefined, |
| @@ -823,7 +824,7 @@ | @@ -823,7 +824,7 @@ | ||
| 823 | awbtype:'001', | 824 | awbtype:'001', |
| 824 | }, | 825 | }, |
| 825 | userinfo: { | 826 | userinfo: { |
| 826 | - username: this.getUserInfoStore.username | 827 | + username: loginedUserInfo().username |
| 827 | }, | 828 | }, |
| 828 | waybill:undefined, | 829 | waybill:undefined, |
| 829 | customText:undefined | 830 | customText:undefined |
| @@ -1071,7 +1072,7 @@ | @@ -1071,7 +1072,7 @@ | ||
| 1071 | }else{ | 1072 | }else{ |
| 1072 | row.flightno=row.flightno; | 1073 | row.flightno=row.flightno; |
| 1073 | } | 1074 | } |
| 1074 | - const map = {'mt1201':row,'username':this.getUserInfoStore.username} | 1075 | + const map = {'mt1201':row,'username':loginedUserInfo().username} |
| 1075 | sendCreateMt1201(map).then(res=>{ | 1076 | sendCreateMt1201(map).then(res=>{ |
| 1076 | let response=res.data; | 1077 | let response=res.data; |
| 1077 | //console.log(res); | 1078 | //console.log(res); |
| @@ -1114,7 +1115,7 @@ | @@ -1114,7 +1115,7 @@ | ||
| 1114 | this.$refs[formName].validate((valid) => { | 1115 | this.$refs[formName].validate((valid) => { |
| 1115 | if (valid) { | 1116 | if (valid) { |
| 1116 | if(this.batichboolean){ | 1117 | if(this.batichboolean){ |
| 1117 | - let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:this.getUserInfoStore.username,contactTel:this.Udform.opertel,content:''} | 1118 | + let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:loginedUserInfo().username,contactTel:this.Udform.opertel,content:''} |
| 1118 | sendBatchDelMt1201(arr).then(res=>{ | 1119 | sendBatchDelMt1201(arr).then(res=>{ |
| 1119 | let response=res.data; | 1120 | let response=res.data; |
| 1120 | this.code=response.code; | 1121 | this.code=response.code; |
| @@ -1137,7 +1138,7 @@ | @@ -1137,7 +1138,7 @@ | ||
| 1137 | 'contactName':this.Udform.operperson, | 1138 | 'contactName':this.Udform.operperson, |
| 1138 | 'contactTel':this.Udform.opertel, | 1139 | 'contactTel':this.Udform.opertel, |
| 1139 | 'carrier':this.Udform.carrier, | 1140 | 'carrier':this.Udform.carrier, |
| 1140 | - 'username':this.getUserInfoStore.username} | 1141 | + 'username':loginedUserInfo().username} |
| 1141 | sendRemoveMt1201(map).then(res=>{ | 1142 | sendRemoveMt1201(map).then(res=>{ |
| 1142 | let response=res.data; | 1143 | let response=res.data; |
| 1143 | //console.log(res); | 1144 | //console.log(res); |
| @@ -1193,7 +1194,7 @@ | @@ -1193,7 +1194,7 @@ | ||
| 1193 | 'reason' :this.Udform.operreason, | 1194 | 'reason' :this.Udform.operreason, |
| 1194 | 'contactName':this.Udform.operperson, | 1195 | 'contactName':this.Udform.operperson, |
| 1195 | 'contactTel':this.Udform.opertel, | 1196 | 'contactTel':this.Udform.opertel, |
| 1196 | - 'username':this.getUserInfoStore.username} | 1197 | + 'username':loginedUserInfo().username} |
| 1197 | sendEditeMt1201(map).then(res=>{ | 1198 | sendEditeMt1201(map).then(res=>{ |
| 1198 | let response=res.data; | 1199 | let response=res.data; |
| 1199 | //console.log(res); | 1200 | //console.log(res); |
| @@ -1314,7 +1315,7 @@ | @@ -1314,7 +1315,7 @@ | ||
| 1314 | _this.ruleForm.userinfo = { | 1315 | _this.ruleForm.userinfo = { |
| 1315 | username: '' | 1316 | username: '' |
| 1316 | } | 1317 | } |
| 1317 | - _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; | 1318 | + _this.ruleForm.userinfo.username=loginedUserInfo().username; |
| 1318 | _this.ruleForm.status='22'; | 1319 | _this.ruleForm.status='22'; |
| 1319 | addMt1201(_this.ruleForm).then(res=>{ | 1320 | addMt1201(_this.ruleForm).then(res=>{ |
| 1320 | let response=res.data; | 1321 | let response=res.data; |
| @@ -1347,7 +1348,7 @@ | @@ -1347,7 +1348,7 @@ | ||
| 1347 | _this.ruleForm.userinfo = { | 1348 | _this.ruleForm.userinfo = { |
| 1348 | username: '' | 1349 | username: '' |
| 1349 | } | 1350 | } |
| 1350 | - _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; | 1351 | + _this.ruleForm.userinfo.username=loginedUserInfo().username; |
| 1351 | ediMt1201(_this.ruleForm).then(res=>{ | 1352 | ediMt1201(_this.ruleForm).then(res=>{ |
| 1352 | let response=res.data; | 1353 | let response=res.data; |
| 1353 | //console.log(res); | 1354 | //console.log(res); |
| @@ -448,6 +448,7 @@ | @@ -448,6 +448,7 @@ | ||
| 448 | import loginUserInfo from '@/api/base' | 448 | import loginUserInfo from '@/api/base' |
| 449 | import {sendBatchApllyMt1201, sendBatchDelMt1201} from "../../api/mt1201"; | 449 | import {sendBatchApllyMt1201, sendBatchDelMt1201} from "../../api/mt1201"; |
| 450 | import {mapActions, mapGetters} from 'vuex' | 450 | import {mapActions, mapGetters} from 'vuex' |
| 451 | + import {loginedUserInfo} from "../../api/user"; | ||
| 451 | export default { | 452 | export default { |
| 452 | data() { | 453 | data() { |
| 453 | return { | 454 | return { |
| @@ -492,7 +493,7 @@ | @@ -492,7 +493,7 @@ | ||
| 492 | wei:undefined, | 493 | wei:undefined, |
| 493 | ext5:undefined, | 494 | ext5:undefined, |
| 494 | userinfo: { | 495 | userinfo: { |
| 495 | - username: this.getUserInfoStore.username | 496 | + username: loginedUserInfo().username |
| 496 | }, | 497 | }, |
| 497 | }, | 498 | }, |
| 498 | FenStatus:'', | 499 | FenStatus:'', |
| @@ -627,7 +628,7 @@ | @@ -627,7 +628,7 @@ | ||
| 627 | if(row.awbh==null){ | 628 | if(row.awbh==null){ |
| 628 | row.awbh=""; | 629 | row.awbh=""; |
| 629 | } | 630 | } |
| 630 | - const map = {'mt520x':row,'username':this.getUserInfoStore.username} | 631 | + const map = {'mt520x':row,'username':loginedUserInfo().username} |
| 631 | sendCreateMt520x(map).then(res=>{ | 632 | sendCreateMt520x(map).then(res=>{ |
| 632 | let response=res.data; | 633 | let response=res.data; |
| 633 | //console.log(res); | 634 | //console.log(res); |
| @@ -673,7 +674,7 @@ | @@ -673,7 +674,7 @@ | ||
| 673 | this.$refs[formName].validate((valid) => { | 674 | this.$refs[formName].validate((valid) => { |
| 674 | if (valid) { | 675 | if (valid) { |
| 675 | if(this.batichboolean){ | 676 | if(this.batichboolean){ |
| 676 | - let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:this.getUserInfoStore.username,contactTel:this.Udform.opertel,content:''} | 677 | + let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:loginedUserInfo().username,contactTel:this.Udform.opertel,content:''} |
| 677 | sendbatchRemoveMt5201(arr).then(res=>{ | 678 | sendbatchRemoveMt5201(arr).then(res=>{ |
| 678 | let response=res.data; | 679 | let response=res.data; |
| 679 | this.code=response.code; | 680 | this.code=response.code; |
| @@ -697,7 +698,7 @@ | @@ -697,7 +698,7 @@ | ||
| 697 | 'contactTel':this.Udform.opertel, | 698 | 'contactTel':this.Udform.opertel, |
| 698 | 'rcfdep':this.rows.rcfdep, | 699 | 'rcfdep':this.rows.rcfdep, |
| 699 | 'carrier':this.rows.carrier, | 700 | 'carrier':this.rows.carrier, |
| 700 | - 'username':this.getUserInfoStore.username} | 701 | + 'username':loginedUserInfo().username} |
| 701 | sendRemoveMt520x(map).then(res=>{ | 702 | sendRemoveMt520x(map).then(res=>{ |
| 702 | let response=res.data; | 703 | let response=res.data; |
| 703 | //console.log(res); | 704 | //console.log(res); |
| @@ -829,7 +830,7 @@ | @@ -829,7 +830,7 @@ | ||
| 829 | _this.ruleForm.userinfo = { | 830 | _this.ruleForm.userinfo = { |
| 830 | username: '' | 831 | username: '' |
| 831 | } | 832 | } |
| 832 | - _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; | 833 | + _this.ruleForm.userinfo.username=loginedUserInfo().username; |
| 833 | _this.ruleForm.status='22'; | 834 | _this.ruleForm.status='22'; |
| 834 | //this.ruleForm.endtime=this.ruleForm.starttime.add(Calendar.MINUTE, 15); | 835 | //this.ruleForm.endtime=this.ruleForm.starttime.add(Calendar.MINUTE, 15); |
| 835 | addMt5201(_this.ruleForm).then(res=>{ | 836 | addMt5201(_this.ruleForm).then(res=>{ |
| @@ -862,7 +863,7 @@ | @@ -862,7 +863,7 @@ | ||
| 862 | _this.ruleForm.userinfo = { | 863 | _this.ruleForm.userinfo = { |
| 863 | username: '' | 864 | username: '' |
| 864 | } | 865 | } |
| 865 | - _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; | 866 | + _this.ruleForm.userinfo.username=loginedUserInfo().username; |
| 866 | ediMt5201(_this.ruleForm).then(res=>{ | 867 | ediMt5201(_this.ruleForm).then(res=>{ |
| 867 | let response=res.data; | 868 | let response=res.data; |
| 868 | _this.code=response.code; | 869 | _this.code=response.code; |
-
请 注册 或 登录 后发表评论