Commit 965d8dd9 authored by 黄自鹏's avatar 黄自鹏

Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

parents 14555d47 f5533dfa
......@@ -11,14 +11,14 @@ NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
router.beforeEach((to, from, next) => {
console.log(store.state.user.token)
NProgress.start()
// console.log(store.state.user.token)
// NProgress.start()
if (getToken()) {
to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
/* has token*/
if (to.path === '/login') {
next({ path: '/' })
NProgress.done()
// NProgress.done()
} else {
if (store.state.app.isInit==false) {
store.commit('app/changeInit')
......@@ -40,11 +40,11 @@ router.beforeEach((to, from, next) => {
next()
} else {
next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
NProgress.done()
// NProgress.done()
}
}
})
router.afterEach(() => {
NProgress.done()
// NProgress.done()
})
<template>
<RelDialog
:type="type"
:editApp="editApp"
:app="app"
:buttonApp="buttonApp"
class="table-form-border"
>
<!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="档案编号" ref="code" prop="code">
<el-input :readonly="readonly" v-toUpperCase v-model="form.code"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="名称" prop="name">
<el-input :readonly="readonly" v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位类型" prop="dwlx">
<el-input :readonly="readonly" v-model="form.dwlx"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="管理责任单位" prop="gsid">
<RelSelect
style="width: 100%;"
src="jcsj/common/bm/queryGs"
:readonly="readonly"
:match="{value:'id',label:'bmmc'}"
v-model="form.gsid"
></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="负责人" prop="fzrid">
<personSelector :label="form.userName||form.userid||'暂无'" @selected="userSelected"></personSelector>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="单位地址" prop="address">
<el-input :readonly="readonly" v-model="form.address"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="电子信箱" prop="email" >
<el-input :readonly="readonly" v-model="form.email"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input :readonly="readonly" v-model="form.phone"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="lxr">
<el-input :readonly="readonly" v-model="form.lxr"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注">
<el-input :readonly="readonly" v-model="form.bz"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 按钮重写, -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里,根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div>-->
</RelDialog>
</template>
<script>
import { editMixin } from "common";
import { initDwlx } from "@/api/outsourcingDirector/wxdwda";
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {},
/* 组件名称*/
name: "roleManagementEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化,根据需求*/
systemType: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
code: "",
name: "",
dwlx: "",
gsid: "",
fzrid:"",
address: "",
email: "",
phone: "",
lxr: "",
bz: ""
},
/* form提交时的规则,具体规则参考官网*/
rules: {
email:[
{ required: true, message: '请输入邮箱地址', trigger: 'blur' },
{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
]
},
dwlxArray: []
};
},
methods: {
userSelected(row) {
this.form.fzrid = row.id;
},
init() {}
},
mounted() {
this.init();
}
};
</script>
<style scoped lang="scss">
$color-border-grey: #c0c4cc;
.table-form-border {
::v-deep .el-form-item__error{
z-index: 99;
right: 10px!important;
top: 25%;
left: auto;
}
.el-form {
border-top: 1px solid $color-border-grey;
border-right: 1px solid $color-border-grey;
}
.el-row .el-form-item {
border-bottom: 1px solid $color-border-grey;
margin-bottom: 0;
::v-deep .el-form-item__label {
border-right: 1px solid $color-border-grey;
border-left: 1px solid $color-border-grey;
padding: 0;
text-align: center;
background: #eee;
}
::v-deep .el-input__inner {
border: none;
}
}
.el-row .el-col:nth-child(2n + 1) {
padding-right: 0 !important;
}
.el-row .el-col:nth-child(2n) {
padding-left: 0 !important;
}
.el-row .el-col.padding-right {
padding-right: 10px!important;
}
.el-row:last-child .el-col,
.el-row:first-child .el-col {
padding-right: 10px !important;
padding-left: 10px !important;
}
}
</style>
<template>
<div class="min_full">
<!-- 查询条件-->
<div class="search" v-condition>
<SearchButton :app="app"></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">档案编号:</span>
<el-input v-model="queryParams.xh"></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">单位名称:</span>
<el-input v-model="queryParams.dwmc"></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">单位类型:</span>
<el-select v-model="queryParams.dwlx" clearable placeholder="请选择">
<el-option
v-for="item in systemType"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
</el-col>
</el-row>
</div>
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app="app"></PrintButton>
<ViewButton ref="view" :app="app"></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app="app"></FieldButton>
<ExcelButton :app="app"></ExcelButton>
<!-- 额外按钮-->
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager delButton
@getData="getData"
:ref="'TablePager'"
:app="app"
:query="query"
@selectItem="selectItem"
@getRow="getRow"
>
<template slot="tabCustom"></template>
</TablePager>
</div>
</div>
</template>
<script>
/* 引入需要的接口*/
import {
doQuery,
doAdd,
doUpdate,
doDelete
} from "@/api/outsourcingDirector/wxdwda";
/* edit页面*/
import Edit from "./edit";
import { tableMixin } from "common";
export default {
mixins: [tableMixin],
name: "appVersion",
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
/*需要的额外参数 */
systemType:[],
showDialog: false,
DialogName: "",
type: "",
DialogTitle: "",
readonly: true,
powerList: [
{
name: "分配"
},
{
name: "复制"
},
{
name: "查看"
}
],
/* 基础url*/
baseUrl: "aqgl/wxgl/wxdwda",
/* 查询参数*/
queryParams: {
code: "",
name: "",
dwlx: ""
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: "code",
label: "档案编号",
width: "120"
},
{
prop: "name",
label: "名称",
width: "160"
},
{
prop: "dwlx",
label: "单位类型",
width: "160"
},
{
prop: "gsid",
label: "责任单位ID",
width: "160",
show: false
},
{
prop: "gsName",
label: "管理责任单位",
width: "160"
},
{
prop: "fzrid",
label: "负责人",
width: "160",
show: false
},
{
prop: "username",
label: "负责人",
width: "160"
},
{
prop: "address",
label: "单位地址",
width: "160"
},
{
prop: "email",
label: "电子邮箱",
width: "160"
},
{
prop: "lxr",
label: "联系人",
width: "120"
},
{
prop: "phone",
label: "联系电话",
width: "120"
},
{
prop: "bz",
label: "备注"
}
],
form: {}
};
},
methods: {
/* 基础查询*/
query: doQuery,
apiAdd: doAdd,
apiUpdate: doUpdate,
apiDelete: doDelete,
init() {},
getRow(currentRow, oldCurrentRow){
this.form=currentRow;
this.rowItem=currentRow
}
},
components: {
Edit
}
};
</script>
<style scoped>
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment