朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 b463128dbd7279a87b48b69bf742898b7af57a2d 1 个父辈 fd6c15fd

菜单组件化

内嵌 并排对比
正在显示 6 个修改的文件 包含 79 行增加 和 37 行删除
1 -const loginuserInfo = JSON.parse(sessionStorage.getItem('user'));  
2 -export default loginuserInfo;  
  1 +import jsutil from "@/common/js/util";
  2 +import { Message } from 'element-ui';
  3 +
  4 +function getusername(){
  5 + let session_user_info = sessionStorage.getItem('user');
  6 + if (session_user_info && jsutil.checkNull(session_user_info)){
  7 + let user = JSON.parse(sessionStorage.getItem('user'));
  8 + return user;
  9 + }else {
  10 + Message({
  11 + message:"未查询到用户缓存名称",
  12 + type:"error",
  13 + });
  14 + return {
  15 + username:""
  16 + };
  17 + }
  18 +
  19 +}
  20 +
  21 +let loginuserInfo = getusername();
  22 +export default loginuserInfo;
@@ -13,16 +13,16 @@ @@ -13,16 +13,16 @@
13 :key="item.name" 13 :key="item.name"
14 :label="item.name" 14 :label="item.name"
15 :name="item.route"> 15 :name="item.route">
16 - <section class="content-container">  
17 - <div>  
18 - <el-col :span="24" class="content-wrapper">  
19 - <transition name="fade" mode="out-in">  
20 - <router-view></router-view>  
21 - </transition>  
22 - </el-col>  
23 - </div>  
24 - </section>  
25 </el-tab-pane> 16 </el-tab-pane>
  17 + <section class="content-container">
  18 + <div>
  19 + <el-col :span="24" class="content-wrapper">
  20 + <transition name="fade" mode="out-in">
  21 + <router-view></router-view>
  22 + </transition>
  23 + </el-col>
  24 + </div>
  25 + </section>
26 </el-tabs> 26 </el-tabs>
27 </div> 27 </div>
28 </template> 28 </template>
1 /** 1 /**
2 * Created by jiachenpan on 16/11/18. 2 * Created by jiachenpan on 16/11/18.
  3 + * 一些工具类
  4 + *
  5 + */
  6 +
  7 +/**
  8 + * 给Date日期对象新增format方法
  9 + * 日期格式化
  10 + * @param fmt
  11 + * @returns {void | string | *}
3 */ 12 */
4 Date.prototype.format = function(fmt) { 13 Date.prototype.format = function(fmt) {
5 var o = { 14 var o = {
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <span class="el-dropdown-link userinfo-inner"> 16 <span class="el-dropdown-link userinfo-inner">
17 <img width="40" height="40" style="border-radius:50%;" src="~img/faceDefault.jpg"/></span> 17 <img width="40" height="40" style="border-radius:50%;" src="~img/faceDefault.jpg"/></span>
18 <el-dropdown-menu slot="dropdown"> 18 <el-dropdown-menu slot="dropdown">
19 - <el-dropdown-item>{{sysUserName}}</el-dropdown-item> 19 + <el-dropdown-item>用户:{{sysUserName}}</el-dropdown-item>
20 <el-dropdown-item>我的消息</el-dropdown-item> 20 <el-dropdown-item>我的消息</el-dropdown-item>
21 <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item> 21 <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item>
22 <el-dropdown-item @click.native="updateCache">更新缓存</el-dropdown-item> 22 <el-dropdown-item @click.native="updateCache">更新缓存</el-dropdown-item>
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 import ElFormItem from "element-ui/packages/form/src/form-item"; 38 import ElFormItem from "element-ui/packages/form/src/form-item";
39 import TabMenu from "@/components/TabMenu" 39 import TabMenu from "@/components/TabMenu"
40 import NavMenu from "@/components/NavMenu" 40 import NavMenu from "@/components/NavMenu"
  41 + import loginuserInfo from "@/api/base";
41 42
42 export default { 43 export default {
43 44
@@ -122,9 +123,8 @@ @@ -122,9 +123,8 @@
122 }, 123 },
123 mounted() { 124 mounted() {
124 var _this = this; 125 var _this = this;
125 - var user = sessionStorage.getItem('user'); 126 + var user = loginuserInfo;
126 if (user) { 127 if (user) {
127 - user = JSON.parse(user);  
128 this.sysUserName = user.username || ''; 128 this.sysUserName = user.username || '';
129 this.sysUserId=user.userId||''; 129 this.sysUserId=user.userId||'';
130 130
@@ -603,6 +603,13 @@ @@ -603,6 +603,13 @@
603 }, 603 },
604 mounted() { 604 mounted() {
605 this.getRoles(); 605 this.getRoles();
  606 + let _this = this;
  607 + document.onkeydown = function (e) {
  608 + let key = window.event.keyCode;
  609 + if (key == 13) {
  610 + _this.getRoles();
  611 + }
  612 + };
606 } 613 }
607 } 614 }
608 615
@@ -318,20 +318,21 @@ @@ -318,20 +318,21 @@
318 @close="trn_addDialogClosed" 318 @close="trn_addDialogClosed"
319 > 319 >
320 <el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="100px" style="margin-top: -20px;label:right" :rules="rules" > 320 <el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="100px" style="margin-top: -20px;label:right" :rules="rules" >
  321 + <el-divider></el-divider>
321 <el-row> 322 <el-row>
322 <el-col :span="24"> 323 <el-col :span="24">
323 - <div class="grid-content content">信息表单 (id: {{form.autoid}})</div> 324 + <div class="grid-content content">信息表单 [id: {{form.autoid}}]</div>
324 </el-col> 325 </el-col>
325 </el-row> 326 </el-row>
326 <el-row> 327 <el-row>
327 <el-col :span="6"> 328 <el-col :span="6">
328 <el-form-item label="海关申报序号" prop="seqno"> 329 <el-form-item label="海关申报序号" prop="seqno">
329 - <el-input v-model="form.seqno" size="small"placeholder="" /> 330 + <el-input v-model="form.seqno" placeholder="" disabled></el-input>
330 </el-form-item> 331 </el-form-item>
331 </el-col> 332 </el-col>
332 <el-col :span="6"> 333 <el-col :span="6">
333 <el-form-item label="海关关区" prop="customscode"> 334 <el-form-item label="海关关区" prop="customscode">
334 - <el-input v-model="customscode" size="small" placeholder="" oninput="value=value.replace(/[^\d]/g,'')" 335 + <el-input v-model="customscode" placeholder="" oninput="value=value.replace(/[^\d]/g,'')"
335 maxLength='4'/> 336 maxLength='4'/>
336 </el-form-item> 337 </el-form-item>
337 </el-col> 338 </el-col>
@@ -349,7 +350,7 @@ @@ -349,7 +350,7 @@
349 <el-col :span="6"> 350 <el-col :span="6">
350 <el-tooltip content="运抵编号：北方模式必填；南方模式免填；水运中转模式选填。运抵编号规则：4位申报地海关代码+2位卸货地代码+6位编号生成日期（顺序为年（2位）月（2位)）日（2位））+6位流水号" effect="light"> 351 <el-tooltip content="运抵编号：北方模式必填；南方模式免填；水运中转模式选填。运抵编号规则：4位申报地海关代码+2位卸货地代码+6位编号生成日期（顺序为年（2位）月（2位)）日（2位））+6位流水号" effect="light">
351 <el-form-item label="运抵编号" prop="arriveno"> 352 <el-form-item label="运抵编号" prop="arriveno">
352 - <el-input v-model="form.arriveno" :disabled="form.trnmode==1" size="small" placeholder="" 353 + <el-input v-model="form.arriveno" :disabled="form.trnmode==1" placeholder=""
353 /> 354 />
354 </el-form-item> 355 </el-form-item>
355 </el-tooltip> 356 </el-tooltip>
@@ -358,39 +359,39 @@ @@ -358,39 +359,39 @@
358 359
359 <!-- <el-col :span="6">--> 360 <!-- <el-col :span="6">-->
360 <!-- <el-form-item label="操作员卡号" prop="inputopid">--> 361 <!-- <el-form-item label="操作员卡号" prop="inputopid">-->
361 -<!-- <el-input v-model="form.inputopid" size="small" placeholder="" />--> 362 +<!-- <el-input v-model="form.inputopid" placeholder="" />-->
362 <!-- </el-form-item>--> 363 <!-- </el-form-item>-->
363 <!-- </el-col>--> 364 <!-- </el-col>-->
364 <!-- <el-col :span="6">--> 365 <!-- <el-col :span="6">-->
365 <!-- <el-form-item label="操作员姓名" prop="inputopname">--> 366 <!-- <el-form-item label="操作员姓名" prop="inputopname">-->
366 -<!-- <el-input v-model="form.inputopname" size="small" placeholder="" />--> 367 +<!-- <el-input v-model="form.inputopname" placeholder="" />-->
367 <!-- </el-form-item>--> 368 <!-- </el-form-item>-->
368 <!-- </el-col>--> 369 <!-- </el-col>-->
369 </el-row> 370 </el-row>
370 <!-- <el-col :span="6">--> 371 <!-- <el-col :span="6">-->
371 <!-- <el-form-item label="报关公司" prop="applyname">--> 372 <!-- <el-form-item label="报关公司" prop="applyname">-->
372 -<!-- <el-input v-model="form.applyname" size="small" placeholder="" />--> 373 +<!-- <el-input v-model="form.applyname" placeholder="" />-->
373 <!-- </el-form-item>--> 374 <!-- </el-form-item>-->
374 <!-- </el-col>--> 375 <!-- </el-col>-->
375 <!-- <el-col :span="6">--> 376 <!-- <el-col :span="6">-->
376 <!-- <el-form-item label="十位海关编码" prop="applycode">--> 377 <!-- <el-form-item label="十位海关编码" prop="applycode">-->
377 -<!-- <el-input v-model="form.applycode" size="small" placeholder="" />--> 378 +<!-- <el-input v-model="form.applycode" placeholder="" />-->
378 <!-- </el-form-item>--> 379 <!-- </el-form-item>-->
379 <!-- </el-col>--> 380 <!-- </el-col>-->
380 <!-- <el-col :span="6">--> 381 <!-- <el-col :span="6">-->
381 <!-- <el-form-item label="组织机构代码" prop="copcode">--> 382 <!-- <el-form-item label="组织机构代码" prop="copcode">-->
382 -<!-- <el-input v-model="form.copcode" size="small" placeholder="" />--> 383 +<!-- <el-input v-model="form.copcode" placeholder="" />-->
383 <!-- </el-form-item>--> 384 <!-- </el-form-item>-->
384 <!-- </el-col>--> 385 <!-- </el-col>-->
385 <el-row> 386 <el-row>
386 <el-col :span="6"> 387 <el-col :span="6">
387 <el-form-item label="运单号" prop="billno"> 388 <el-form-item label="运单号" prop="billno">
388 - <el-input v-model="form.billno" size="small" placeholder="" /> 389 + <el-input v-model="form.billno" placeholder="" />
389 </el-form-item> 390 </el-form-item>
390 </el-col> 391 </el-col>
391 <el-col :span="6"> 392 <el-col :span="6">
392 <el-form-item label="进出境运输方式" prop="trafmode" label-width="110px"> 393 <el-form-item label="进出境运输方式" prop="trafmode" label-width="110px">
393 -<!-- <el-input v-model="form.trafmode" size="small" placeholder="" />--> 394 +<!-- <el-input v-model="form.trafmode" placeholder="" />-->
394 <el-select v-model="form.trafmode" placeholder="请选择" size="mini" > 395 <el-select v-model="form.trafmode" placeholder="请选择" size="mini" >
395 <el-option label="2-江海运输" value="2"></el-option> 396 <el-option label="2-江海运输" value="2"></el-option>
396 <el-option label="3-铁路运输" value="3"></el-option> 397 <el-option label="3-铁路运输" value="3"></el-option>
@@ -403,7 +404,7 @@ @@ -403,7 +404,7 @@
403 <el-col :span="6"> 404 <el-col :span="6">
404 <el-tooltip content="运输工具名称：北方模式选填；南方模式填写@+13位载货清单号；水运中转模式必填：境内水路运输填报驳船船名，境内铁路运输填报车名（主管海关4位关别代码+TRAIN）；境内公路运输填报车名（主管海关4位关别代码+TRUCK）" placement="bottom" effect="light"> 405 <el-tooltip content="运输工具名称：北方模式选填；南方模式填写@+13位载货清单号；水运中转模式必填：境内水路运输填报驳船船名，境内铁路运输填报车名（主管海关4位关别代码+TRAIN）；境内公路运输填报车名（主管海关4位关别代码+TRUCK）" placement="bottom" effect="light">
405 <el-form-item label="运输工具名称" prop="trafname"> 406 <el-form-item label="运输工具名称" prop="trafname">
406 - <el-input v-model="form.trafname" size="small" placeholder="" /> 407 + <el-input v-model="form.trafname" placeholder="" />
407 </el-form-item> 408 </el-form-item>
408 </el-tooltip> 409 </el-tooltip>
409 410
@@ -411,7 +412,7 @@ @@ -411,7 +412,7 @@
411 <el-col :span="6"> 412 <el-col :span="6">
412 <el-tooltip content="启运时间：北方模式选填；南方模式免填；水运中转模式必填：境内水路运输填报驳船航次号，境内铁路、公路运输填报6位启运日期（顺序为年（2位）月（2位）日（2位））" placement="bottom" effect="light"> 413 <el-tooltip content="启运时间：北方模式选填；南方模式免填；水运中转模式必填：境内水路运输填报驳船航次号，境内铁路、公路运输填报6位启运日期（顺序为年（2位）月（2位）日（2位））" placement="bottom" effect="light">
413 <el-form-item label="启运时间" prop="voyageno"> 414 <el-form-item label="启运时间" prop="voyageno">
414 - <!-- <el-input v-model="form.voyageno" size="small" placeholder="" />--> 415 + <!-- <el-input v-model="form.voyageno" placeholder="" />-->
415 <el-date-picker 416 <el-date-picker
416 v-model="form.voyageno" 417 v-model="form.voyageno"
417 type="date" size="mini" 418 type="date" size="mini"
@@ -429,7 +430,7 @@ @@ -429,7 +430,7 @@
429 430
430 <el-col :span="6"> 431 <el-col :span="6">
431 <el-form-item label="境内运输方式" prop="trafway"> 432 <el-form-item label="境内运输方式" prop="trafway">
432 -<!-- <el-input v-model="form.trafway" size="small" placeholder="" />--> 433 +<!-- <el-input v-model="form.trafway" placeholder="" />-->
433 <el-select v-model="form.trafway" placeholder="请选择" size="mini"> 434 <el-select v-model="form.trafway" placeholder="请选择" size="mini">
434 <el-option label="2-江海运输" value="2"></el-option> 435 <el-option label="2-江海运输" value="2"></el-option>
435 <el-option label="3-铁路运输" value="3"></el-option> 436 <el-option label="3-铁路运输" value="3"></el-option>
@@ -441,17 +442,17 @@ @@ -441,17 +442,17 @@
441 </el-col> 442 </el-col>
442 <el-col :span="6"> 443 <el-col :span="6">
443 <el-form-item label="托运件数" prop="packno"> 444 <el-form-item label="托运件数" prop="packno">
444 - <el-input v-model="form.packno" size="small" placeholder="" /> 445 + <el-input v-model="form.packno" placeholder="" />
445 </el-form-item> 446 </el-form-item>
446 </el-col> 447 </el-col>
447 <el-col :span="6"> 448 <el-col :span="6">
448 <el-form-item label="托运重量" prop="grosswt"> 449 <el-form-item label="托运重量" prop="grosswt">
449 - <el-input v-model="form.grosswt" size="small" placeholder="" /> 450 + <el-input v-model="form.grosswt" placeholder="" />
450 </el-form-item> 451 </el-form-item>
451 </el-col> 452 </el-col>
452 <el-col :span="6"> 453 <el-col :span="6">
453 <el-form-item label="卸货地代码" prop="unloadcode"> 454 <el-form-item label="卸货地代码" prop="unloadcode">
454 - <el-input v-model="unloadcode" size="small" placeholder="" /> 455 + <el-input v-model="unloadcode" placeholder="" />
455 </el-form-item> 456 </el-form-item>
456 </el-col> 457 </el-col>
457 </el-row> 458 </el-row>
@@ -459,7 +460,7 @@ @@ -459,7 +460,7 @@
459 <el-col :span="6"> 460 <el-col :span="6">
460 <el-tooltip content="集装箱(器)编号：集装箱货物必填：4个字母即货主编码、6位数字序列号以及1位检测数字组成；非集装箱货物免填" placement="bottom" effect="light"> 461 <el-tooltip content="集装箱(器)编号：集装箱货物必填：4个字母即货主编码、6位数字序列号以及1位检测数字组成；非集装箱货物免填" placement="bottom" effect="light">
461 <el-form-item label="集装箱编号" prop="contaid"> 462 <el-form-item label="集装箱编号" prop="contaid">
462 - <el-input v-model="form.contaid" size="small" placeholder="" /> 463 + <el-input v-model="form.contaid" placeholder="" />
463 </el-form-item> 464 </el-form-item>
464 </el-tooltip> 465 </el-tooltip>
465 466
@@ -480,7 +481,7 @@ @@ -480,7 +481,7 @@
480 <el-col :span="6"> 481 <el-col :span="6">
481 <el-tooltip content="集装箱(器)尺寸：集装箱货物必填；非集装箱货物免填" placement="bottom" effect="light"> 482 <el-tooltip content="集装箱(器)尺寸：集装箱货物必填；非集装箱货物免填" placement="bottom" effect="light">
482 <el-form-item label="集装器尺寸" prop="contatype"> 483 <el-form-item label="集装器尺寸" prop="contatype">
483 - <el-input v-model="form.contatype" size="small" placeholder="" /> 484 + <el-input v-model="form.contatype" placeholder="" />
484 </el-form-item> 485 </el-form-item>
485 </el-tooltip> 486 </el-tooltip>
486 487
@@ -493,7 +494,7 @@ @@ -493,7 +494,7 @@
493 <el-input 494 <el-input
494 v-model="form.notes" 495 v-model="form.notes"
495 type="textarea" 496 type="textarea"
496 - :rows="1" size="small" style="width: 440px" 497 + :rows="1" style="width: 440px"
497 placeholder="请输入内容" 498 placeholder="请输入内容"
498 /> 499 />
499 </el-form-item> 500 </el-form-item>
@@ -502,8 +503,8 @@ @@ -502,8 +503,8 @@
502 <el-row> 503 <el-row>
503 <el-col :span="24"> 504 <el-col :span="24">
504 <el-form-item> 505 <el-form-item>
505 - <el-button size="small" style="margin-left: 500px;width: 100px" type="info" @click="trn_dialog.addDialog = false">取消</el-button>  
506 - <el-button type="primary" size="small" style="margin-left: 20px;width: 100px" @click="dialogStatus==='create'?trn_add():trn_edit()">提交</el-button> 506 + <el-button style="margin-left: 500px;width: 100px" type="info" @click="trn_dialog.addDialog = false">取消</el-button>
  507 + <el-button type="primary" style="margin-left: 20px;width: 100px" @click="dialogStatus==='create'?trn_add():trn_edit()">提交</el-button>
507 </el-form-item> 508 </el-form-item>
508 </el-col> 509 </el-col>
509 </el-row> 510 </el-row>
@@ -524,6 +525,7 @@ @@ -524,6 +525,7 @@
524 import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn"; 525 import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn";
525 import DetailedLog from '@/components/detailedDialog' 526 import DetailedLog from '@/components/detailedDialog'
526 import uti from '@/utils' 527 import uti from '@/utils'
  528 + import loginuserInfo from "@/api/base";
527 529
528 530
529 export default { 531 export default {
@@ -619,7 +621,7 @@ @@ -619,7 +621,7 @@
619 clientseqno:'', 621 clientseqno:'',
620 hostid:'', 622 hostid:'',
621 certno:'', 623 certno:'',
622 - 624 + username:''
623 625
624 }, 626 },
625 rules: { 627 rules: {
@@ -645,6 +647,10 @@ @@ -645,6 +647,10 @@
645 mounted() { 647 mounted() {
646 //获取列表 648 //获取列表
647 this.trnList(); 649 this.trnList();
  650 + var user = loginuserInfo;
  651 + if (user) {
  652 + this.form.username = user.username || '';
  653 + }
648 }, 654 },
649 computed:{ 655 computed:{
650 customscode: { 656 customscode: {