Skip to content

S
SuperMan
Commit d25219fe authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 82729c2f c37b7343
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 72 deletions
src/assets/common/lang/zh.js
View file @ d25219fe
......@@ -37,6 +37,9 @@ export const pub={
returnBack:'返回',
allday:'全天',
clickToView:'点击查看',
man:'男',
woman:'女',
}
export const login = {
......@@ -1072,4 +1075,31 @@ export const rule = {
qxzshleixing: '请选择账户类型',
qxzzhfenlei: '请选择账户分类',
qxzzhanghu: '请选择账户',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
qsrbdgangwei:"请选择绑定岗位",
qsrzqdbmdianhua:"请输入正确的部门电话",
qszhengshu:"请输整数",
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addzibumen:"添加子部门",
adm_addbumen:"添加部门",
adm_addyuangong:"添加员工",
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
}
\ No newline at end of file
src/components/FinancialModule/FinancialDocuments.vue
View file @ d25219fe
......@@ -544,7 +544,7 @@
<th>当前状态</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr class="_item_list" v-for="(item,index) in DataList">
<tr class="_item_list" v-for="(item,index) in DataList">
<td v-if="checkboxShow"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
<td>{{item.BranchName}}</td>
<td class="Bill_par">
......@@ -607,7 +607,7 @@
<td>
<template v-for="(s,si) in item.CostTypeList">
<span class="_tag_span">{{s}}</span><br/>
</template>
</template>
</td>
<td class="_number">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
......@@ -1360,7 +1360,7 @@ export default {
pageSize:6,
FrID:this.msg.FrID==0?'':this.msg.FrID,
sDate:this.msg.sDate,
eDate:this.msg.sDate,
eDate:this.msg.eDate,
Status:this.msg.Status,
TemplateId:this.msg.TemplateId,
RB_Branch_Id:this.msg.RB_Branch_Id,
......
src/components/administrative/departmentManagement.vue
View file @ d25219fe
......@@ -111,7 +111,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>
......@@ -125,9 +125,9 @@
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" @click="outerVisible = true,dialogTitle='新增部门',getCompany()" class="normalBtn"
<input type="button" @click="outerVisible = true,getCompany()" class="normalBtn"
:value="$t('pub.addBtn')"/>
<input type="button" class="normalBtn" value="树形结构" @click="isTree=true"/>
<input type="button" class="normalBtn" :value="$t('adm.adm_sxjg')" @click="isTree=true"/>
</li>
</ul>
</div>
......@@ -135,9 +135,9 @@
<div v-show="isTree" class="departmentTreeStyleCont">
<div class="departmentTreeStyle">
<p>
结构管理
{{$t('adm.adm_jggl')}}
<input type="button" class="normalBtn fr"
style="font-size: 12px; width: 86px; height: 24px; padding: 0 2px; margin-top: -5px;" value="返回列表"
style="font-size: 12px; width: 86px; height: 24px; padding: 0 2px; margin-top: -5px;" :value="$t('adm.adm_fhlb')"
@click="isTree=false"/>
</p>
<el-tree :data="allList" node-key="id" :props="defaultProps" @node-drag-start="handleDragStart"
......@@ -151,24 +151,24 @@
{{node.label}}<span v-show="data.DType==2"
style="background: #E95252; font-size: 12px; height: 16px; line-height: 16px; color:#fff; padding: 0 4px; border-radius: 4px; display: inline-block; margin-left: 5px;">{{data.PostName}}</span>
<span class="spanIcon" v-if="data.DType==1">
<el-tooltip class="item" effect="dark" content="添加子部门" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_addzibumen')" placement="top">
<i class="iconfont icon-tianjia"
@click="treeLayerShow=true;treeLayerShowUser=false,treeLayerTitle='添加部门',resetForm('addMsg'),addTreeData(data)"></i>
@click="treeLayerShow=true;treeLayerShowUser=false,resetForm('addMsg'),addTreeData(data)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加员工" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_addyuangong')" placement="top">
<i class="iconfont icon-tianjiayuangong"
@click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='添加员工',resetForm('addMsg1'),addTreeUerData(data)"></i>
@click="treeLayerShow=false,treeLayerShowUser=true,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>
<span class="spanIcon" v-if="data.DType==2">
<el-tooltip class="item" effect="dark" content="员工修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('adm.adm_edityuangong')" placement="top">
<i class="iconfont icon-xiugai"
@click="treeLayerShow=false,treeLayerShowUser=true,treeLayerUserTitle='修改员工信息',resetForm('addMsg1'),updateDataUser(data)"></i>
</el-tooltip>
......@@ -181,31 +181,31 @@
<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.unlimitedSel')">
<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.unlimitedSel')">
<el-option v-for='item in layerDepartMentList' :label='item.DepartmentName' :value='item.DepartmentID' :key="item.DepartmentID">
</el-option>
</el-select>
</el-form-item>
</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-form-item :label="$t('admin.admin_Post')" prop="RB_Post_Id">
<el-select filterable v-model='addMsg1.RB_Post_Id' :placeholder="$t('pub.unlimitedSel')">
<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,20 +213,20 @@
</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-option label='男' value='0'></el-option>
<el-option label='女' value='1'></el-option>
<el-form-item :label="$t('leader.leader_Sex')" prop="EmSex">
<el-select filterable v-model='addMsg1.EmSex' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.man')" value='0'></el-option>
<el-option :label="$t('pub.woman')" value='1'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="学历" prop="EmEducation">
<el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
<el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -245,18 +245,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('pub.mbPhoneNum')" 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('pub.telphone')" prop="EmTel">
<el-input maxlength='20' type="text" v-model="addMsg1.EmTel"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
......@@ -274,7 +274,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 +286,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 +302,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.unlimitedSel')"
@change='getDeparmentTierByBranch'>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......@@ -422,7 +422,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.unlimitedSel')"
@change='getDeparmentTierByBranch'>
<el-option v-for='item in layercompanyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option>
......@@ -544,17 +544,17 @@
rules: { //表单验证
RB_Branch_Id: [{
required: true,
message: '请选择公司',
message: this.$t('rule.company'),
trigger: 'change'
}],
DepartmentName: [{
required: true,
message: '请输入部门名称',
message: this.$t('rule.qsrbmmingchen'),
trigger: 'blur'
}],
Tier: [{
required: true,
message: '请选择部门层级',
message: this.$t('rule.qxzbmcengji'),
trigger: 'change'
}],
ParentId: [{
......@@ -563,22 +563,22 @@
}],
DepartmentManager: [{
required: false,
message: '请选择负责人',
message: this.$t('rule.qxzfuzeren'),
trigger: 'change'
}],
PostIdArr: [{
required: true,
message: '请选择绑定岗位',
message: this.$t('rule.qsrbdgangwei'),
trigger: 'change'
}],
DepartmentTel: [{
pattern: /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/,
message: '请输入正确的部门电话'
message: this.$t('rule.qsrzqdbmdianhua')
}],
Sort: [{
required: true,
pattern: /^(-|\+)?\d+$/,
message: '请输整数'
message: this.$t('rule.qszhengshu')
}],
IsLeader: [{
required: false,
......@@ -609,22 +609,22 @@
rules1: {
RB_Branch_id: [{
required: true,
message: '请选择公司',
message: this.$t('rule.company'),
trigger: 'change'
}],
RB_Department_Id: [{
required: true,
message: '请选择部门',
message: this.$t('tips.qxzbumen'),
trigger: 'change'
}],
RB_Post_Id: [{
required: true,
message: '请选择岗位',
message: this.$t('tips.qxzgangwei'),
trigger: 'change'
}],
EmName: [{
required: true,
message: '请输入姓名',
message: this.$t('rule.qsrname'),
trigger: 'blur'
}],
EmEntry: [{
......@@ -634,7 +634,7 @@
}],
EmAccount: [{
required: true,
message: '请输入账号',
message: this.$t('login.login_account'),
trigger: 'blur'
},
{
......@@ -644,7 +644,7 @@
],
EmPassword: [{
required: true,
message: '请输入密码',
message: this.$t('login.login_password'),
trigger: 'blur'
}],
EmQQ: [{
......@@ -653,11 +653,11 @@
}],
EmMobile: [{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: '请输入正确的手机'
message: this.$t('rule.qsrtelphone'),
}],
EmCard: [{
pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
message: '请输正确的身份证号'
message: '请输正确的身份证号459258'
}],
},
//请求数据
......@@ -947,6 +947,7 @@
})
},
getCompany() { //公司
this.dialogTitle=this.$t('adm.adm_xzbumen');
this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
if (this.outerVisible) {
this.layercompanyList = res.data.data
......@@ -1041,6 +1042,7 @@
})
},
addTreeData(obj) {
this.treeLayerTitle=this.$t('adm.adm_addbumen');
this.getCompany()
this.layerDepartmentMsg.BranchId = this.layerTierMsg.BranchId = this.addMsg.RB_Branch_Id = obj.RB_Branch_Id
this.layerDepartmentMsg.Tier = obj.Tier + 1;
......@@ -1052,6 +1054,7 @@
},
addTreeUerData(obj) {
this.isleaveBtn = false;
this.treeLayerUserTitle=this.$t('adm.adm_addyuangong');
this.getCompany()
this.getDepartmentMsg.RB_Branch_Id = this.addMsg1.RB_Branch_id = obj.RB_Branch_Id
this.getDerpartMent();
......
src/components/platformModule/companyManagement.vue
View file @ d25219fe
......@@ -23,22 +23,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 +49,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 +63,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 +92,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'
......@@ -147,10 +147,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("admin.admin_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 +159,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('admin.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>
......@@ -197,9 +197,9 @@
</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>
......@@ -221,10 +221,10 @@
return {
options: [{
value: '0',
label: '开启'
label: this.$t('pub.openSel')
}, {
value: '1',
label: '关闭'
label: this.$t('pub.closeSel')
}],
ProvinceList:[],
CityList:[],
......
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