朱兆平 / vue_cli · 提交

转到一个项目

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

菜单组件化

内嵌 并排对比
正在显示 6 个修改的文件 包含 70 行增加 和 28 行删除
const loginuserInfo = JSON.parse(sessionStorage.getItem('user'));
import jsutil from "@/common/js/util";
import { Message } from 'element-ui';
function getusername(){
let session_user_info = sessionStorage.getItem('user');
if (session_user_info && jsutil.checkNull(session_user_info)){
let user = JSON.parse(sessionStorage.getItem('user'));
return user;
}else {
Message({
message:"未查询到用户缓存名称",
type:"error",
});
return {
username:""
};
}
}
let loginuserInfo = getusername();
export default loginuserInfo;
... ...
... ... @@ -13,6 +13,7 @@
:key="item.name"
:label="item.name"
:name="item.route">
</el-tab-pane>
<section class="content-container">
<div>
<el-col :span="24" class="content-wrapper">
... ... @@ -22,7 +23,6 @@
</el-col>
</div>
</section>
</el-tab-pane>
</el-tabs>
</div>
</template>
... ...
/**
* Created by jiachenpan on 16/11/18.
* 一些工具类
*
*/
/**
* 给Date日期对象新增format方法
* 日期格式化
* @param fmt
* @returns {void | string | *}
*/
Date.prototype.format = function(fmt) {
var o = {
... ...
... ... @@ -16,7 +16,7 @@
<span class="el-dropdown-link userinfo-inner">
<img width="40" height="40" style="border-radius:50%;" src="~img/faceDefault.jpg"/></span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>{{sysUserName}}</el-dropdown-item>
<el-dropdown-item>用户:{{sysUserName}}</el-dropdown-item>
<el-dropdown-item>我的消息</el-dropdown-item>
<el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item>
<el-dropdown-item @click.native="updateCache">更新缓存</el-dropdown-item>
... ... @@ -38,6 +38,7 @@
import ElFormItem from "element-ui/packages/form/src/form-item";
import TabMenu from "@/components/TabMenu"
import NavMenu from "@/components/NavMenu"
import loginuserInfo from "@/api/base";
export default {
... ... @@ -122,9 +123,8 @@
},
mounted() {
var _this = this;
var user = sessionStorage.getItem('user');
var user = loginuserInfo;
if (user) {
user = JSON.parse(user);
this.sysUserName = user.username || '';
this.sysUserId=user.userId||'';
... ...
... ... @@ -603,6 +603,13 @@
},
mounted() {
this.getRoles();
let _this = this;
document.onkeydown = function (e) {
let key = window.event.keyCode;
if (key == 13) {
_this.getRoles();
}
};
}
}
... ...
... ... @@ -318,20 +318,21 @@
@close="trn_addDialogClosed"
>
<el-form ref="form" :inline="true" :model="form" class="demo-form-inline" label-width="100px" style="margin-top: -20px;label:right" :rules="rules" >
<el-divider></el-divider>
<el-row>
<el-col :span="24">
<div class="grid-content content">信息表单 (id: {{form.autoid}})</div>
<div class="grid-content content">信息表单 [id: {{form.autoid}}]</div>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="海关申报序号" prop="seqno">
<el-input v-model="form.seqno" size="small"placeholder="" />
<el-input v-model="form.seqno" placeholder="" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="海关关区" prop="customscode">
<el-input v-model="customscode" size="small" placeholder="" oninput="value=value.replace(/[^\d]/g,'')"
<el-input v-model="customscode" placeholder="" oninput="value=value.replace(/[^\d]/g,'')"
maxLength='4'/>
</el-form-item>
</el-col>
... ... @@ -349,7 +350,7 @@
<el-col :span="6">
<el-tooltip content="运抵编号：北方模式必填；南方模式免填；水运中转模式选填。运抵编号规则：4位申报地海关代码+2位卸货地代码+6位编号生成日期（顺序为年（2位）月（2位)）日（2位））+6位流水号" effect="light">
<el-form-item label="运抵编号" prop="arriveno">
<el-input v-model="form.arriveno" :disabled="form.trnmode==1" size="small" placeholder=""
<el-input v-model="form.arriveno" :disabled="form.trnmode==1" placeholder=""
/>
</el-form-item>
</el-tooltip>
... ... @@ -358,39 +359,39 @@
<!-- <el-col :span="6">-->
<!-- <el-form-item label="操作员卡号" prop="inputopid">-->
<!-- <el-input v-model="form.inputopid" size="small" placeholder="" />-->
<!-- <el-input v-model="form.inputopid" placeholder="" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="操作员姓名" prop="inputopname">-->
<!-- <el-input v-model="form.inputopname" size="small" placeholder="" />-->
<!-- <el-input v-model="form.inputopname" placeholder="" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="报关公司" prop="applyname">-->
<!-- <el-input v-model="form.applyname" size="small" placeholder="" />-->
<!-- <el-input v-model="form.applyname" placeholder="" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="十位海关编码" prop="applycode">-->
<!-- <el-input v-model="form.applycode" size="small" placeholder="" />-->
<!-- <el-input v-model="form.applycode" placeholder="" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="组织机构代码" prop="copcode">-->
<!-- <el-input v-model="form.copcode" size="small" placeholder="" />-->
<!-- <el-input v-model="form.copcode" placeholder="" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-row>
<el-col :span="6">
<el-form-item label="运单号" prop="billno">
<el-input v-model="form.billno" size="small" placeholder="" />
<el-input v-model="form.billno" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="进出境运输方式" prop="trafmode" label-width="110px">
<!-- <el-input v-model="form.trafmode" size="small" placeholder="" />-->
<!-- <el-input v-model="form.trafmode" placeholder="" />-->
<el-select v-model="form.trafmode" placeholder="请选择" size="mini" >
<el-option label="2-江海运输" value="2"></el-option>
<el-option label="3-铁路运输" value="3"></el-option>
... ... @@ -403,7 +404,7 @@
<el-col :span="6">
<el-tooltip content="运输工具名称：北方模式选填；南方模式填写@+13位载货清单号；水运中转模式必填：境内水路运输填报驳船船名，境内铁路运输填报车名（主管海关4位关别代码+TRAIN）；境内公路运输填报车名（主管海关4位关别代码+TRUCK）" placement="bottom" effect="light">
<el-form-item label="运输工具名称" prop="trafname">
<el-input v-model="form.trafname" size="small" placeholder="" />
<el-input v-model="form.trafname" placeholder="" />
</el-form-item>
</el-tooltip>
... ... @@ -411,7 +412,7 @@
<el-col :span="6">
<el-tooltip content="启运时间：北方模式选填；南方模式免填；水运中转模式必填：境内水路运输填报驳船航次号，境内铁路、公路运输填报6位启运日期（顺序为年（2位）月（2位）日（2位））" placement="bottom" effect="light">
<el-form-item label="启运时间" prop="voyageno">
<!-- <el-input v-model="form.voyageno" size="small" placeholder="" />-->
<!-- <el-input v-model="form.voyageno" placeholder="" />-->
<el-date-picker
v-model="form.voyageno"
type="date" size="mini"
... ... @@ -429,7 +430,7 @@
<el-col :span="6">
<el-form-item label="境内运输方式" prop="trafway">
<!-- <el-input v-model="form.trafway" size="small" placeholder="" />-->
<!-- <el-input v-model="form.trafway" placeholder="" />-->
<el-select v-model="form.trafway" placeholder="请选择" size="mini">
<el-option label="2-江海运输" value="2"></el-option>
<el-option label="3-铁路运输" value="3"></el-option>
... ... @@ -441,17 +442,17 @@
</el-col>
<el-col :span="6">
<el-form-item label="托运件数" prop="packno">
<el-input v-model="form.packno" size="small" placeholder="" />
<el-input v-model="form.packno" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="托运重量" prop="grosswt">
<el-input v-model="form.grosswt" size="small" placeholder="" />
<el-input v-model="form.grosswt" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="卸货地代码" prop="unloadcode">
<el-input v-model="unloadcode" size="small" placeholder="" />
<el-input v-model="unloadcode" placeholder="" />
</el-form-item>
</el-col>
</el-row>
... ... @@ -459,7 +460,7 @@
<el-col :span="6">
<el-tooltip content="集装箱(器)编号：集装箱货物必填：4个字母即货主编码、6位数字序列号以及1位检测数字组成；非集装箱货物免填" placement="bottom" effect="light">
<el-form-item label="集装箱编号" prop="contaid">
<el-input v-model="form.contaid" size="small" placeholder="" />
<el-input v-model="form.contaid" placeholder="" />
</el-form-item>
</el-tooltip>
... ... @@ -480,7 +481,7 @@
<el-col :span="6">
<el-tooltip content="集装箱(器)尺寸：集装箱货物必填；非集装箱货物免填" placement="bottom" effect="light">
<el-form-item label="集装器尺寸" prop="contatype">
<el-input v-model="form.contatype" size="small" placeholder="" />
<el-input v-model="form.contatype" placeholder="" />
</el-form-item>
</el-tooltip>
... ... @@ -493,7 +494,7 @@
<el-input
v-model="form.notes"
type="textarea"
:rows="1" size="small" style="width: 440px"
:rows="1" style="width: 440px"
placeholder="请输入内容"
/>
</el-form-item>
... ... @@ -502,8 +503,8 @@
<el-row>
<el-col :span="24">
<el-form-item>
<el-button size="small" style="margin-left: 500px;width: 100px" type="info" @click="trn_dialog.addDialog = false">取消</el-button>
<el-button type="primary" size="small" style="margin-left: 20px;width: 100px" @click="dialogStatus==='create'?trn_add():trn_edit()">提交</el-button>
<el-button style="margin-left: 500px;width: 100px" type="info" @click="trn_dialog.addDialog = false">取消</el-button>
<el-button type="primary" style="margin-left: 20px;width: 100px" @click="dialogStatus==='create'?trn_add():trn_edit()">提交</el-button>
</el-form-item>
</el-col>
</el-row>
... ... @@ -524,6 +525,7 @@
import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn";
import DetailedLog from '@/components/detailedDialog'
import uti from '@/utils'
import loginuserInfo from "@/api/base";
export default {
... ... @@ -619,7 +621,7 @@
clientseqno:'',
hostid:'',
certno:'',
username:''
},
rules: {
... ... @@ -645,6 +647,10 @@
mounted() {
//获取列表
this.trnList();
var user = loginuserInfo;
if (user) {
this.form.username = user.username || '';
}
},
computed:{
customscode: {
... ...