正在显示
5 个修改的文件
包含
40 行增加
和
26 行删除
@@ -540,6 +540,7 @@ | @@ -540,6 +540,7 @@ | ||
540 | import{addResponse,selectResponseList} from "../../api/InResponse"; | 540 | import{addResponse,selectResponseList} from "../../api/InResponse"; |
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 | export default{ | 544 | export default{ |
544 | data(){ | 545 | data(){ |
545 | return{ | 546 | return{ |
@@ -797,7 +798,7 @@ | @@ -797,7 +798,7 @@ | ||
797 | }, | 798 | }, |
798 | //发送分拨申请报 | 799 | //发送分拨申请报 |
799 | importSend(index,row){ | 800 | importSend(index,row){ |
800 | - const map = {'mt6202':row,'username':loginUserInfo.username} | 801 | + const map = {'mt6202':row,'username':this.getUserInfoStore.username} |
801 | sendCreateMt6202(map).then(res=>{ | 802 | sendCreateMt6202(map).then(res=>{ |
802 | let response=res.data; | 803 | let response=res.data; |
803 | //console.log(res); | 804 | //console.log(res); |
@@ -847,7 +848,7 @@ | @@ -847,7 +848,7 @@ | ||
847 | 'contactName':this.Udform.operperson, | 848 | 'contactName':this.Udform.operperson, |
848 | 'contactTel':this.Udform.opertel, | 849 | 'contactTel':this.Udform.opertel, |
849 | 'carrier':this.rows.carrier, | 850 | 'carrier':this.rows.carrier, |
850 | - 'username':loginUserInfo.username} | 851 | + 'username':this.getUserInfoStore.username} |
851 | if(this.rows.turntype=='MT6202'){ | 852 | if(this.rows.turntype=='MT6202'){ |
852 | sendRemoveMt6202(map).then(res=>{ | 853 | sendRemoveMt6202(map).then(res=>{ |
853 | let response=res.data; | 854 | let response=res.data; |
@@ -897,7 +898,7 @@ | @@ -897,7 +898,7 @@ | ||
897 | //发送分拨运抵报 | 898 | //发送分拨运抵报 |
898 | arriveSend(index,row){ | 899 | arriveSend(index,row){ |
899 | 900 | ||
900 | - const map = {'mt3202':row,'username':loginUserInfo.username} | 901 | + const map = {'mt3202':row,'username':this.getUserInfoStore.username} |
901 | sendCreateMt3202(map).then(res=>{ | 902 | sendCreateMt3202(map).then(res=>{ |
902 | let response=res.data; | 903 | let response=res.data; |
903 | //console.log(res); | 904 | //console.log(res); |
@@ -1039,6 +1040,9 @@ | @@ -1039,6 +1040,9 @@ | ||
1039 | }); | 1040 | }); |
1040 | } | 1041 | } |
1041 | }, | 1042 | }, |
1043 | + computed:{ | ||
1044 | + ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性,相当于this.$store.getters.resturantName | ||
1045 | + }, | ||
1042 | mounted(){ | 1046 | mounted(){ |
1043 | this.getList(); | 1047 | this.getList(); |
1044 | } | 1048 | } |
@@ -98,6 +98,7 @@ | @@ -98,6 +98,7 @@ | ||
98 | 98 | ||
99 | <script> | 99 | <script> |
100 | import { selectFlightLists } from '../../api/mt1201' | 100 | import { selectFlightLists } from '../../api/mt1201' |
101 | + import {mapActions, mapGetters} from 'vuex' | ||
101 | export default { | 102 | export default { |
102 | data() { | 103 | data() { |
103 | /*初始化值*/ | 104 | /*初始化值*/ |
@@ -108,7 +109,8 @@ | @@ -108,7 +109,8 @@ | ||
108 | currentPage:1, | 109 | currentPage:1, |
109 | pageSize:10, | 110 | pageSize:10, |
110 | total:0, | 111 | total:0, |
111 | - tableloading:true | 112 | + tableloading:true, |
113 | + departmentid:'' | ||
112 | } | 114 | } |
113 | }, | 115 | }, |
114 | methods: { | 116 | methods: { |
@@ -127,7 +129,7 @@ | @@ -127,7 +129,7 @@ | ||
127 | }, | 129 | }, |
128 | /*查询列表请求*/ | 130 | /*查询列表请求*/ |
129 | getFlightList:function() { | 131 | getFlightList:function() { |
130 | - let params={currentPage:this.currentPage,pageSize:this.pageSize,flighttime:this.flighttime,carrier:this.carrier}; | 132 | + let params={currentPage:this.currentPage,pageSize:this.pageSize,flighttime:this.flighttime,carrier:this.carrier,departmentid:this.getUserInfoStore.companyInfo.departmentid}; |
131 | this.listLoading = true; | 133 | this.listLoading = true; |
132 | selectFlightLists(params).then(res=>{ | 134 | selectFlightLists(params).then(res=>{ |
133 | let response=res.data.data; | 135 | let response=res.data.data; |
@@ -154,7 +156,8 @@ | @@ -154,7 +156,8 @@ | ||
154 | set:function (val) { | 156 | set:function (val) { |
155 | this.carrier=val.toUpperCase(); | 157 | this.carrier=val.toUpperCase(); |
156 | } | 158 | } |
157 | - } | 159 | + }, |
160 | + ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性,相当于this.$store.getters.resturantName | ||
158 | }, | 161 | }, |
159 | /*渲染方法*/ | 162 | /*渲染方法*/ |
160 | mounted() { | 163 | mounted() { |
@@ -737,6 +737,7 @@ | @@ -737,6 +737,7 @@ | ||
737 | import XLSX from "xlsx"; | 737 | import XLSX from "xlsx"; |
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 | export default { | 741 | export default { |
741 | data() { | 742 | data() { |
742 | /*初始数据*/ | 743 | /*初始数据*/ |
@@ -822,7 +823,7 @@ | @@ -822,7 +823,7 @@ | ||
822 | awbtype:'001', | 823 | awbtype:'001', |
823 | }, | 824 | }, |
824 | userinfo: { | 825 | userinfo: { |
825 | - username: '11111' | 826 | + username: this.getUserInfoStore.username |
826 | }, | 827 | }, |
827 | waybill:undefined, | 828 | waybill:undefined, |
828 | customText:undefined | 829 | customText:undefined |
@@ -1070,7 +1071,7 @@ | @@ -1070,7 +1071,7 @@ | ||
1070 | }else{ | 1071 | }else{ |
1071 | row.flightno=row.flightno; | 1072 | row.flightno=row.flightno; |
1072 | } | 1073 | } |
1073 | - const map = {'mt1201':row,'username':loginUserInfo.username} | 1074 | + const map = {'mt1201':row,'username':this.getUserInfoStore.username} |
1074 | sendCreateMt1201(map).then(res=>{ | 1075 | sendCreateMt1201(map).then(res=>{ |
1075 | let response=res.data; | 1076 | let response=res.data; |
1076 | //console.log(res); | 1077 | //console.log(res); |
@@ -1113,7 +1114,7 @@ | @@ -1113,7 +1114,7 @@ | ||
1113 | this.$refs[formName].validate((valid) => { | 1114 | this.$refs[formName].validate((valid) => { |
1114 | if (valid) { | 1115 | if (valid) { |
1115 | if(this.batichboolean){ | 1116 | if(this.batichboolean){ |
1116 | - let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:loginUserInfo.username,contactTel:this.Udform.opertel,content:''} | 1117 | + let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:this.getUserInfoStore.username,contactTel:this.Udform.opertel,content:''} |
1117 | sendBatchDelMt1201(arr).then(res=>{ | 1118 | sendBatchDelMt1201(arr).then(res=>{ |
1118 | let response=res.data; | 1119 | let response=res.data; |
1119 | this.code=response.code; | 1120 | this.code=response.code; |
@@ -1136,7 +1137,7 @@ | @@ -1136,7 +1137,7 @@ | ||
1136 | 'contactName':this.Udform.operperson, | 1137 | 'contactName':this.Udform.operperson, |
1137 | 'contactTel':this.Udform.opertel, | 1138 | 'contactTel':this.Udform.opertel, |
1138 | 'carrier':this.Udform.carrier, | 1139 | 'carrier':this.Udform.carrier, |
1139 | - 'username':loginUserInfo.username} | 1140 | + 'username':this.getUserInfoStore.username} |
1140 | sendRemoveMt1201(map).then(res=>{ | 1141 | sendRemoveMt1201(map).then(res=>{ |
1141 | let response=res.data; | 1142 | let response=res.data; |
1142 | //console.log(res); | 1143 | //console.log(res); |
@@ -1192,7 +1193,7 @@ | @@ -1192,7 +1193,7 @@ | ||
1192 | 'reason' :this.Udform.operreason, | 1193 | 'reason' :this.Udform.operreason, |
1193 | 'contactName':this.Udform.operperson, | 1194 | 'contactName':this.Udform.operperson, |
1194 | 'contactTel':this.Udform.opertel, | 1195 | 'contactTel':this.Udform.opertel, |
1195 | - 'username':loginUserInfo.username} | 1196 | + 'username':this.getUserInfoStore.username} |
1196 | sendEditeMt1201(map).then(res=>{ | 1197 | sendEditeMt1201(map).then(res=>{ |
1197 | let response=res.data; | 1198 | let response=res.data; |
1198 | //console.log(res); | 1199 | //console.log(res); |
@@ -1313,7 +1314,7 @@ | @@ -1313,7 +1314,7 @@ | ||
1313 | _this.ruleForm.userinfo = { | 1314 | _this.ruleForm.userinfo = { |
1314 | username: '' | 1315 | username: '' |
1315 | } | 1316 | } |
1316 | - _this.ruleForm.userinfo.username=_this.LoginUserInfo.username; | 1317 | + _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; |
1317 | _this.ruleForm.status='22'; | 1318 | _this.ruleForm.status='22'; |
1318 | addMt1201(_this.ruleForm).then(res=>{ | 1319 | addMt1201(_this.ruleForm).then(res=>{ |
1319 | let response=res.data; | 1320 | let response=res.data; |
@@ -1346,7 +1347,7 @@ | @@ -1346,7 +1347,7 @@ | ||
1346 | _this.ruleForm.userinfo = { | 1347 | _this.ruleForm.userinfo = { |
1347 | username: '' | 1348 | username: '' |
1348 | } | 1349 | } |
1349 | - _this.ruleForm.userinfo.username=_this.LoginUserInfo.username; | 1350 | + _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; |
1350 | ediMt1201(_this.ruleForm).then(res=>{ | 1351 | ediMt1201(_this.ruleForm).then(res=>{ |
1351 | let response=res.data; | 1352 | let response=res.data; |
1352 | //console.log(res); | 1353 | //console.log(res); |
@@ -1394,6 +1395,9 @@ | @@ -1394,6 +1395,9 @@ | ||
1394 | }, | 1395 | }, |
1395 | 1396 | ||
1396 | }, | 1397 | }, |
1398 | + computed:{ | ||
1399 | + ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性,相当于this.$store.getters.resturantName | ||
1400 | + }, | ||
1397 | /*渲染方法*/ | 1401 | /*渲染方法*/ |
1398 | mounted(){ | 1402 | mounted(){ |
1399 | this.getDefaultData(); | 1403 | this.getDefaultData(); |
@@ -447,6 +447,7 @@ | @@ -447,6 +447,7 @@ | ||
447 | import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode,sendbatchRemoveMt5201,sendbatchCreateMt5201} from '../../api/mt5201' | 447 | import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode,sendbatchRemoveMt5201,sendbatchCreateMt5201} from '../../api/mt5201' |
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 | export default { | 451 | export default { |
451 | data() { | 452 | data() { |
452 | return { | 453 | return { |
@@ -491,7 +492,7 @@ | @@ -491,7 +492,7 @@ | ||
491 | wei:undefined, | 492 | wei:undefined, |
492 | ext5:undefined, | 493 | ext5:undefined, |
493 | userinfo: { | 494 | userinfo: { |
494 | - username: '11111' | 495 | + username: this.getUserInfoStore.username |
495 | }, | 496 | }, |
496 | }, | 497 | }, |
497 | FenStatus:'', | 498 | FenStatus:'', |
@@ -626,7 +627,7 @@ | @@ -626,7 +627,7 @@ | ||
626 | if(row.awbh==null){ | 627 | if(row.awbh==null){ |
627 | row.awbh=""; | 628 | row.awbh=""; |
628 | } | 629 | } |
629 | - const map = {'mt520x':row,'username':loginUserInfo.username} | 630 | + const map = {'mt520x':row,'username':this.getUserInfoStore.username} |
630 | sendCreateMt520x(map).then(res=>{ | 631 | sendCreateMt520x(map).then(res=>{ |
631 | let response=res.data; | 632 | let response=res.data; |
632 | //console.log(res); | 633 | //console.log(res); |
@@ -672,7 +673,7 @@ | @@ -672,7 +673,7 @@ | ||
672 | this.$refs[formName].validate((valid) => { | 673 | this.$refs[formName].validate((valid) => { |
673 | if (valid) { | 674 | if (valid) { |
674 | if(this.batichboolean){ | 675 | if(this.batichboolean){ |
675 | - let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:loginUserInfo.username,contactTel:this.Udform.opertel,content:''} | 676 | + let arr={ids:this.uuids,reason:this.Udform.operreason,contactName:this.getUserInfoStore.username,contactTel:this.Udform.opertel,content:''} |
676 | sendbatchRemoveMt5201(arr).then(res=>{ | 677 | sendbatchRemoveMt5201(arr).then(res=>{ |
677 | let response=res.data; | 678 | let response=res.data; |
678 | this.code=response.code; | 679 | this.code=response.code; |
@@ -696,7 +697,7 @@ | @@ -696,7 +697,7 @@ | ||
696 | 'contactTel':this.Udform.opertel, | 697 | 'contactTel':this.Udform.opertel, |
697 | 'rcfdep':this.rows.rcfdep, | 698 | 'rcfdep':this.rows.rcfdep, |
698 | 'carrier':this.rows.carrier, | 699 | 'carrier':this.rows.carrier, |
699 | - 'username':loginUserInfo.username} | 700 | + 'username':this.getUserInfoStore.username} |
700 | sendRemoveMt520x(map).then(res=>{ | 701 | sendRemoveMt520x(map).then(res=>{ |
701 | let response=res.data; | 702 | let response=res.data; |
702 | //console.log(res); | 703 | //console.log(res); |
@@ -828,7 +829,7 @@ | @@ -828,7 +829,7 @@ | ||
828 | _this.ruleForm.userinfo = { | 829 | _this.ruleForm.userinfo = { |
829 | username: '' | 830 | username: '' |
830 | } | 831 | } |
831 | - _this.ruleForm.userinfo.username=_this.LoginUserInfo.username; | 832 | + _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; |
832 | _this.ruleForm.status='22'; | 833 | _this.ruleForm.status='22'; |
833 | //this.ruleForm.endtime=this.ruleForm.starttime.add(Calendar.MINUTE, 15); | 834 | //this.ruleForm.endtime=this.ruleForm.starttime.add(Calendar.MINUTE, 15); |
834 | addMt5201(_this.ruleForm).then(res=>{ | 835 | addMt5201(_this.ruleForm).then(res=>{ |
@@ -861,7 +862,7 @@ | @@ -861,7 +862,7 @@ | ||
861 | _this.ruleForm.userinfo = { | 862 | _this.ruleForm.userinfo = { |
862 | username: '' | 863 | username: '' |
863 | } | 864 | } |
864 | - _this.ruleForm.userinfo.username=_this.LoginUserInfo.username; | 865 | + _this.ruleForm.userinfo.username=_this.getUserInfoStore.username; |
865 | ediMt5201(_this.ruleForm).then(res=>{ | 866 | ediMt5201(_this.ruleForm).then(res=>{ |
866 | let response=res.data; | 867 | let response=res.data; |
867 | _this.code=response.code; | 868 | _this.code=response.code; |
@@ -886,6 +887,9 @@ | @@ -886,6 +887,9 @@ | ||
886 | this.$router.go(-1);//返回上一层 | 887 | this.$router.go(-1);//返回上一层 |
887 | }, | 888 | }, |
888 | }, | 889 | }, |
890 | + computed:{ | ||
891 | + ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性,相当于this.$store.getters.resturantName | ||
892 | + }, | ||
889 | //渲染方法 | 893 | //渲染方法 |
890 | mounted(){ | 894 | mounted(){ |
891 | this.getDefaultData(); | 895 | this.getDefaultData(); |
@@ -246,6 +246,7 @@ | @@ -246,6 +246,7 @@ | ||
246 | </style> | 246 | </style> |
247 | <script> | 247 | <script> |
248 | import { QueryData } from '../../api/wayDeclaration' | 248 | import { QueryData } from '../../api/wayDeclaration' |
249 | + import {mapActions, mapGetters} from 'vuex' | ||
249 | export default { | 250 | export default { |
250 | data() { | 251 | data() { |
251 | return { | 252 | return { |
@@ -255,7 +256,8 @@ | @@ -255,7 +256,8 @@ | ||
255 | flightno:'', | 256 | flightno:'', |
256 | flightdate:'', | 257 | flightdate:'', |
257 | status:'', | 258 | status:'', |
258 | - messageType:'' | 259 | + messageType:'', |
260 | + departmentid:'' | ||
259 | }, | 261 | }, |
260 | options: [ | 262 | options: [ |
261 | { | 263 | { |
@@ -294,9 +296,6 @@ | @@ -294,9 +296,6 @@ | ||
294 | handleSelectionChange(val) { | 296 | handleSelectionChange(val) { |
295 | this.multipleSelection = val; | 297 | this.multipleSelection = val; |
296 | }, | 298 | }, |
297 | - handleClick(row) { | ||
298 | - console.log(row); | ||
299 | - }, | ||
300 | handleSizeChange(val) { | 299 | handleSizeChange(val) { |
301 | this.pageSize=val; | 300 | this.pageSize=val; |
302 | this.QueryData(); | 301 | this.QueryData(); |
@@ -315,11 +314,10 @@ | @@ -315,11 +314,10 @@ | ||
315 | //条件查询方法 | 314 | //条件查询方法 |
316 | QueryData(){ | 315 | QueryData(){ |
317 | let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier, | 316 | let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier, |
318 | - flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType}; | 317 | + flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType,departmentid:this.getUserInfoStore.companyInfo.departmentid}; |
319 | this.tableloading=true; | 318 | this.tableloading=true; |
320 | QueryData(params).then(res =>{ | 319 | QueryData(params).then(res =>{ |
321 | let response=res.data.data; | 320 | let response=res.data.data; |
322 | - console.log(response) | ||
323 | this.tableData=response.list; | 321 | this.tableData=response.list; |
324 | this.total=response.total; | 322 | this.total=response.total; |
325 | this.tableloading = false; | 323 | this.tableloading = false; |
@@ -353,7 +351,8 @@ | @@ -353,7 +351,8 @@ | ||
353 | set:function (val) { | 351 | set:function (val) { |
354 | this.defaultQuery.carrier=val.toUpperCase(); | 352 | this.defaultQuery.carrier=val.toUpperCase(); |
355 | } | 353 | } |
356 | - } | 354 | + }, |
355 | + ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性,相当于this.$store.getters.resturantName | ||
357 | }, | 356 | }, |
358 | 357 | ||
359 | } | 358 | } |
-
请 注册 或 登录 后发表评论