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
Expand all 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/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