Skip to content

S
SuperMan
Commit bb498f69 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

修改行政部分样式

parent f92813aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 141 deletions
src/components/FinancialModule/ReportForm/MonthReport.vue
View file @ bb498f69
......@@ -997,7 +997,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
// this.msg.OutBranchId=this.CompanyList[0].Id;
this.msg.OutBranchId=this.CompanyList[0].Id;
} else {
}
},
......
src/components/administrative/Attendance.vue
View file @ bb498f69
......@@ -36,7 +36,7 @@
<th>绑定考勤</th>
<th>{{$t('admin.admin_kqTime')}}</th>
<th >{{$t('admin.admin_czPerson')}}</th>
<th width="80">{{$t('admin.admin_operate')}}</th>
<th width="150">{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.BranchName}}</td>
......
src/components/administrative/departmentManagement.vue
View file @ bb498f69
......@@ -79,10 +79,14 @@
.departmentTreeStyleCont .el-date-editor.el-input__inner {
width: auto !important;
}
.departmentTreeLayer .el-form-item__label{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
</style>
<template>
<div class="flexOne">
</el-select>
<div class="query-box" v-show="!isTree">
<ul>
<li>
......@@ -111,7 +115,7 @@
</span>
</li>
<li>
<span><em>部门层级</em><el-select v-model="msg.Tier">
<span><em>{{$t('admin.admin_departmentLevel')}}</em><el-select v-model="msg.Tier">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in tierList' :label='item.name' :value='item.id' :key="item.id"></el-option>
</el-select>
......@@ -159,11 +163,11 @@
<i class="iconfont icon-tianjiayuangong"
@click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='添加员工',resetForm('addMsg1'),addTreeUerData(data)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i class="iconfont icon-xiugai"
@click="treeLayerShow=true,treeLayerShowUser=false,treeLayerTitle='部门信息编辑',resetForm('addMsg'),updateData(data.DepartmentID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
<i class="iconfont icon-shanchu" @click='deleteDeparment(data.DepartmentID)'></i>
</el-tooltip>
</span>
......@@ -181,16 +185,16 @@
<el-form :model="addMsg1" :rules="rules1" ref="addMsg1" label-width="90px">
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="公司" prop="RB_Branch_id">
<el-select filterable v-model='addMsg1.RB_Branch_id' @change='layerLinkageDepartment' placeholder="请选择">
<el-form-item :label="$t('system.table_company')" prop="RB_Branch_id">
<el-select filterable v-model='addMsg1.RB_Branch_id' @change='layerLinkageDepartment' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="部门" prop="RB_Department_Id">
<el-select filterable v-model='addMsg1.RB_Department_Id' @change='layerLinkagePost' placeholder="请选择">
<el-form-item :label="$t('admin.admin_Department')" prop="RB_Department_Id">
<el-select filterable v-model='addMsg1.RB_Department_Id' @change='layerLinkagePost' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in layerDepartMentList' :label='item.DepartmentName' :value='item.DepartmentID' :key="item.DepartmentID">
</el-option>
</el-select>
......@@ -198,14 +202,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="岗位" prop="RB_Post_Id">
<el-select filterable v-model='addMsg1.RB_Post_Id' placeholder="请选择">
<el-select filterable v-model='addMsg1.RB_Post_Id' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in layerPostList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="姓名" prop="EmName">
<el-form-item :label="$t('system.query_name')" prop="EmName">
<el-input maxlength='20' type="text" v-model="addMsg1.EmName"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -213,13 +217,13 @@
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="身份证" prop="EmCard">
<el-form-item :label="$t('system.table_IDcard')" prop="EmCard">
<el-input type="text" v-model="addMsg1.EmCard" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="性别" prop="EmSex">
<el-select filterable v-model='addMsg1.EmSex' placeholder="请选择">
<el-form-item :label="$t('system.table_sex')" prop="EmSex">
<el-select filterable v-model='addMsg1.EmSex' :placeholder="$t('pub.pleaseSel')">
<el-option label='男' value='0'></el-option>
<el-option label='女' value='1'></el-option>
</el-select>
......@@ -245,18 +249,18 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地址" prop="EmAddress">
<el-form-item :label="$t('admin.admin_address')" prop="EmAddress">
<el-input maxlength='50' type="text" v-model="addMsg1.EmAddress"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机号" prop="EmMobile">
<el-form-item :label="$t('system.table_phone')" prop="EmMobile">
<el-input type="text" v-model="addMsg1.EmMobile" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="座机" prop="EmTel">
<el-form-item :label="$t('hotel.hotel_landline')" prop="EmTel">
<el-input maxlength='20' type="text" v-model="addMsg1.EmTel"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -274,7 +278,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="账号" prop="EmAccount">
<el-form-item :label="$t('system.table_acc')" prop="EmAccount">
<el-input type="text" v-model="addMsg1.EmAccount" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
......@@ -286,9 +290,9 @@
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<input type="button" value="取消" class="hollowFixedBtn"
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" value="保存" @click="submitForm1('addMsg1')"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
<button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
</el-col>
</el-row>
......@@ -302,7 +306,7 @@
<el-row :gutter="10">
<el-col :span="6">
<el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id">
<el-select filterable clearable v-model='addMsg.RB_Branch_Id' placeholder="请选择"
<el-select filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.pleaseSel')"
@change='getDeparmentTierByBranch'>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......@@ -389,7 +393,7 @@
<th>{{$t('admin.admin_leader')}}</th>
<th>{{$t('admin.admin_dphone')}}</th>
<th width="300">绑定岗位</th>
<th>排序</th>
<th>{{$t('system.table_rank')}}</th>
<th>{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
......@@ -401,11 +405,11 @@
<td>{{item.PostName}}</td>
<td>{{item.Sort}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible = true,dialogTitle='修改部门信息',updateData(item.DepartmentID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
<el-button type="danger" icon="el-icon-delete" @click='deleteDeparment(item.DepartmentID)'
circle></el-button>
</el-tooltip>
......@@ -422,7 +426,7 @@
<tr>
<td>
<el-form-item :label="$t('admin.admin_company')" prop="RB_Branch_Id">
<el-select class='w200' filterable clearable v-model='addMsg.RB_Branch_Id' placeholder="请选择"
<el-select class='w200' filterable clearable v-model='addMsg.RB_Branch_Id' :placeholder="$t('pub.pleaseSel')"
@change='getDeparmentTierByBranch'>
<el-option v-for='item in layercompanyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......
src/components/administrative/positionManagement.vue
View file @ bb498f69
......@@ -10,9 +10,9 @@
@keyup.enter.native="getList"></el-input></span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" @click="outerVisible = true,dialogTitle='新增岗位',layerShowIndex=1,getCompany()"
class="normalBtn" value="新增"/>
class="normalBtn" :value="$t('pub.addBtn')"/>
</li>
</ul>
</div>
......@@ -20,14 +20,14 @@
<tr>
<th>岗位名称</th>
<th>更新时间</th>
<th width="250">操作</th>
<th width="250">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.PostName}}</td>
<td>{{item.UpdateTime}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button
@click="outerVisible = true,dialogTitle='修改岗位信息',getCompany(),getDerpartMent(),updateData(index,item.PostId)"
type="primary" icon="el-icon-edit"></el-button>
......@@ -38,7 +38,7 @@
<el-tooltip class="item" effect="dark" content="APP角色管理" placement="top-start">
<el-button @click="roleAllocation(item.PostId,2)" type="primary" icon="iconfont icon-user11"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button @click="deleteData(item.PostId)" type="danger" icon="el-icon-delete"></el-button>
</el-tooltip>
</el-button-group>
......@@ -56,7 +56,7 @@
<el-input class='w300' type="text" v-model="addMsg.PostName" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label="是否应用分区" prop="IsUseSubarea">
<el-select v-model="addMsg.IsUseSubarea" placeholder="请选择">
<el-select v-model="addMsg.IsUseSubarea" :placeholder="$t('pub.pleaseSel')">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>
......@@ -67,9 +67,9 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button> &nbsp;
<button v-if="this.layerShowIndex==1" class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
<button v-if="this.layerShowIndex==2" class="normalBtn" type="primary" @click="updateRole()">保存</button>
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button v-if="this.layerShowIndex==1" class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button v-if="this.layerShowIndex==2" class="normalBtn" type="primary" @click="updateRole()">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......
src/components/platformModule/appPermissionList.vue
View file @ bb498f69
......@@ -33,7 +33,7 @@
color: #999;
width: 80px;
font-size: 12px;
height: 60px;
/* height: 60px; */
padding: 10px 0;
border-radius: 4px;
text-align: center;
......
src/components/platformModule/appRoleManagement.vue
View file @ bb498f69
......@@ -5,13 +5,13 @@
<div class="query-box">
<ul>
<li>
<span><em>角色名称</em><el-input v-model='msg.Name' placeholder="请输入内容"></el-input></span>
<span><em>角色名称</em><el-input v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>状态</em><el-select v-model='msg.Status' placeholder="不限">
<el-option label='不限' value=''></el-option>
<el-option label='正常' value='0'></el-option>
<el-option label='冻结' value='1'></el-option>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model='msg.Status' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option :label="$t('pub.normalSel')" value='0'></el-option>
<el-option :label="$t('pub.fressSel')" value='1'></el-option>
</el-select>
</span>
</li>
......@@ -27,29 +27,28 @@
</span>
</li> -->
<li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()()" value="查询" />
<input type="button" @click="outerVisible = true,dialogTitle='新增角色',resetForm('addMsg')" class="normalBtn" value="新增" />
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()()" :value="$t('pub.searchBtn')" />
<input type="button" @click="outerVisible = true,dialogTitle='新增角色',resetForm('addMsg')" class="normalBtn" :value="$t('pub.addBtn')" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="300">角色名称</th>
<th width="600">描述</th>
<th width="100">状态</th>
<!-- <th>版本名称</th> -->
<th>操作人</th>
<th>操作</th>
<th width="600">{{$t('system.label_info')}}</th>
<th width="100">{{$t('admin.admin_status')}}</th>
<th width="100">{{$t('admin.admin_czPerson')}}</th>
<th width="150">{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.Name}}</td>
<td>{{item.Description}}</td>
<td>{{item.Status==0?'正常':'冻结'}}</td>
<td>{{item.Status==0? $t('pub.normalSel'):$t('pub.fressSel')}}</td>
<!-- <td>{{item.VersionsName}}</td> -->
<td>{{item.EmName}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button @click="outerVisible = true,dialogTitle='修改角色',updateData(item.Id)" type="primary" icon="el-icon-edit" circle></el-button>
</el-tooltip>
......@@ -74,10 +73,10 @@
</el-select>
</el-form-item> -->
<el-form-item label="状态" prop="Status">
<el-form-item :label="$t('admin.admin_status')" prop="Status">
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item label="描述" prop="Description">
<el-form-item :label="$t('system.label_info')" prop="Description">
<el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Description"></el-input>
</el-form-item>
......
src/components/platformModule/companyManagement.vue
View file @ bb498f69
......@@ -7,6 +7,10 @@
.companyManagement .avatar-uploader .el-upload:hover {border-color: #409EFF;}
.companyManagement .avatar-uploader-icon {font-size: 28px;color:white;width: 100px;height: 100px;line-height: 80px;text-align: center;position: absolute;left: 0;top: 0;background:rgba(0,0,0,0.5);}
.companyManagement .avatar {width: 100px;height: 100px;display: block;position: absolute;left: 0;top: 0}
.repUp{
margin-top:15px;
display: block;
}
</style>
<template>
<div class="flexOne companyManagement">
......@@ -23,22 +27,22 @@
</span>
</li>-->
<li>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" placeholder="请输入内容"></el-input></span>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" placeholder="请输入内容"></el-input></span>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li>
<li>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" placeholder="不限">
<el-option label='不限' value=''></el-option>
<el-option label='开启' value='0'></el-option>
<el-option label='关闭' value='1'></el-option>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option :label="$t('pub.openSel')" value='0'></el-option>
<el-option :label="$t('pub.closeSel')" value='1'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" value="新增" @click="outerVisible = true,dialogTitle='新增公司'" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible = true,dialogTitle='新增公司'" />
</li>
</ul>
......@@ -49,8 +53,8 @@
<th width="300">{{$t('admin.admin_company')}}</th>
<!-- <th>{{$t('admin.admin_domain')}}</th> -->
<!-- <th>{{$t('admin.admin_leader')}}</th> -->
<th>联系人</th>
<th>联系电话</th>
<th>{{$t('hotel.suplier_contact')}}</th>
<th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('admin.admin_isshow')}}</th>
<th>公司类型</th>
......@@ -63,7 +67,7 @@
<!-- <td>{{item.BranchManagerName}}</td> -->
<td>{{item.ContactPersion}}</td>
<td>{{item.MobilePhone}}</td>
<td>{{item.Status==0?'开启':'关闭'}}</td>
<td>{{item.Status==0 ? $t('pub.openSel'):$t('pub.closeSel')}}</td>
<td>{{item.is_show==0?'显示':'不显示'}}</td>
<td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td>
......@@ -92,7 +96,7 @@
<!-- <el-form-item class='w400' :label="$t('admin.admin_domain')" prop="Domain">
<el-input type="text" v-model="addMsg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> -->
<el-form-item label="省份" prop="Province">
<el-form-item :label="$t('system.table_pvrg')" prop="Province">
<el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.Province" @change="getCityList(addMsg.Province,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option>
<el-option v-for='item in ProvinceList'
......@@ -103,7 +107,7 @@
</el-select>
</el-form-item>
<el-form-item label="城市" prop="City">
<el-form-item :label="$t('system.table_city')" prop="City">
<el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option>
<el-option v-for='item in CityList'
......@@ -147,10 +151,10 @@
<el-input type="text" v-model="addMsg.GatheringAddress" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> -->
<el-form-item class='w400' label='状态' prop="Status" >
<el-form-item class='w400' :label="$t('admin.admin_status')" prop="Status" >
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否显示' prop="is_show">
<el-form-item class='w400' :label="$t('system.table_isShow')" prop="is_show">
<el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
......@@ -159,9 +163,9 @@
<el-form-item class='w400' label='部门初始层级' prop="BeginTier">
<el-input type="text" v-model="addMsg.BeginTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='负责人' prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' placeholder="请选择">
<el-option label='不限' value='0'></el-option>
<el-form-item class='w400' :label="$t('admin.admin_leader')" prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in employeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
......@@ -192,14 +196,14 @@
<span v-else class="repUp">{{$t('system.up_upImg')}}</span>
</el-upload>
</el-form-item>
<el-form-item class='w400' label='备注' prop="Remarks">
<el-form-item class='w400' :label="$t('hotel.hotel_remark')" prop="Remarks">
<el-input type="textarea" v-model="addMsg.Remarks"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button>
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......@@ -219,13 +223,6 @@
}
}
return {
options: [{
value: '0',
label: '开启'
}, {
value: '1',
label: '关闭'
}],
ProvinceList:[],
CityList:[],
commonDefaultSelect:0,
......
src/components/platformModule/permissionList.vue
View file @ bb498f69
......@@ -3,8 +3,10 @@
.mentTable{background: #BCBCBC; width: 100%; font-size: 14px; }
.mentTable td{background: #fff; height: 30px;}
.per_first_menu{overflow: hidden;}
.per_first_menu li{float: left; margin-right: 30px; position: relative; cursor: pointer; background: #fff; color: #999; width: 80px; font-size: 12px; height: 60px; padding: 10px 0; border-radius: 4px; text-align: center;}
.per_first_menu li.FirsrMenuCked{background: #E95252; color: #f1f1f1;}
.per_first_menu li{float: left; margin-right: 30px; position: relative; margin-bottom:15px;
cursor: pointer; background: #fff; color: #999; width: 80px; font-size: 12px; height: 60px; padding: 10px 0; border-radius: 4px; text-align: center;}
.per_first_menu li.FirsrMenuCked{background: #E95252; color: #f1f1f1;
}
.per_first_menu li i{font-size: 30px; line-height: 35px;}
.per_detail_menu{width: 100%; height: 300px; padding: 20px; margin: 40px 0; background: #fff; border-radius: 8px;}
.per_secondMenu{height: auto; overflow: hidden; margin-bottom: 20px;}
......
src/components/platformModule/roleManagement.vue
View file @ bb498f69
......@@ -4,41 +4,41 @@
<ul>
<li>
<span><em>角色名称</em>
<el-input v-model='msg.Name' placeholder="请输入内容"></el-input>
<el-input v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span><em>状态</em>
<el-select v-model='msg.Status' placeholder="不限">
<el-option label='不限' value=''></el-option>
<el-option label='正常' value='0'></el-option>
<el-option label='冻结' value='1'></el-option>
<span><em>{{$t('admin.admin_status')}}</em>
<el-select v-model='msg.Status' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option :label="$t('pub.normalSel')" value='0'></el-option>
<el-option :label="$t('pub.fressSel')" value='1'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" value="查询" />
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" :value="$t('pub.searchBtn')" />
<input type="button" @click="outerVisible = true,dialogTitle='新增角色',resetForm('addMsg')" class="normalBtn"
value="新增" />
:value="$t('pub.addBtn')" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="300">角色名称</th>
<th width="800">描述</th>
<th width="100">状态</th>
<th>操作人</th>
<th>操作</th>
<th width="600">{{$t('system.label_info')}}</th>
<th width="100">{{$t('admin.admin_status')}}</th>
<th width="100">{{$t('admin.admin_czPerson')}}</th>
<th width="150">{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in dataList">
<td>{{item.Name}}</td>
<td>{{item.Description}}</td>
<td>{{item.Status==0?'正常':'冻结'}}</td>
<td>{{item.Status==0? $t('pub.normalSel'):$t('pub.fressSel')}}</td>
<td>{{item.EmName}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button @click="outerVisible = true,dialogTitle='修改角色',updateData(item.Id)" type="primary" icon="el-icon-edit"
circle></el-button>
</el-tooltip>
......@@ -59,10 +59,10 @@
<el-form-item maxlength='50' label="角色名称" prop="Name">
<el-input class='w217' type="text" v-model="addMsg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label="状态" prop="Status">
<el-form-item :label="$t('admin.admin_status')" prop="Status">
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item label="描述" prop="Description">
<el-form-item :label="$t('system.label_info')" prop="Description">
<el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Description"></el-input>
</el-form-item>
</el-form>
......
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