Skip to content

S
SuperMan
Commit aadb3fa6 authored by youjie's avatar youjie
Browse files
Options

平台账户

parent e1b5302e
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 148 deletions
src/assets/common/lang/zhCN/fill.js
View file @ aadb3fa6
......@@ -815,6 +815,16 @@ export const obj = {
xianchaomarj: '现钞买入价',
shangtiaohl: '上调汇率',
lishihl: '历史汇率',
li: '历',
chuhshibwbje: '初始本位币金额',
chuhshiybje: '初始原币金额',
qichuyyrqi: '期初应用日期',
pingtaimima: '平台密码',
pingtaiwangzhi: '平台网址',
baozhengjdh: '保证金单号',
hetongfujian: '合同附件',
jiekuansifs: '结款时间和方式',
hetongshijian: '合同时间',
caravanshopcol: {
t1: '车/使用时间/天数',
t2: '用车详情',
......
src/components/FinancialModule/CashAccount.vue
View file @ aadb3fa6
......@@ -275,17 +275,17 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始本位币金额">
<el-form-item :label="$t('objFill.chuhshibwbje')">
<el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始原币金额">
<el-form-item :label="$t('objFill.chuhshiybje')">
<el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="期初应用日期">
<el-form-item :label="$t('objFill.qichuyyrqi')">
<el-date-picker type="date" v-model="addMsg.BeginTimeStr"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
......
src/components/FinancialModule/CompanyAccount.vue
View file @ aadb3fa6
......@@ -340,17 +340,17 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始本位币金额">
<el-form-item :label="$t('objFill.chuhshibwbje')">
<el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始原币金额">
<el-form-item :label="$t('objFill.chuhshiybje')">
<el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="期初应用日期">
<el-form-item :label="$t('objFill.qichuyyrqi')">
<el-date-picker type="date" v-model="addMsg.BeginTimeStr"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
......
src/components/FinancialModule/DepartmentStatistics.vue
View file @ aadb3fa6
......@@ -47,14 +47,14 @@
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
value-format="yyyy-MM-dd"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</li>
<li>
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="getList">查询</el-button>
<!-- <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</!-->
<!-- <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</!-->
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li>
</ul>
......@@ -70,12 +70,12 @@
<span>{{item.Name}}</span>
</td>
<td>
<span class="underline" @click="goFinal(1,item.CreateBy)">{{item.AuditNum}}</span>
<span class="underline" @click="goFinal(1,item.CreateBy)">{{item.AuditNum}}</span>
</td>
<td>
<span class="underline" @click="goFinal(2,item.CreateBy)">{{item.CreateNum}}</span>
<span class="underline" @click="goFinal(2,item.CreateBy)">{{item.CreateNum}}</span>
</td>
</tr>
</table>
......@@ -83,7 +83,7 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='total'>
</el-pagination>
</div>
</template>
......@@ -149,7 +149,7 @@ import moment from "moment"
}
}, err => {})
},
goFinal(fin,id){
document.querySelector("#app").click();
this.$router.push({
......
src/components/FinancialModule/DocumentStatistics.vue
View file @ aadb3fa6
......@@ -45,9 +45,9 @@
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
:start-placeholder="$t('OrderList.star')"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</li>
<li style="float:right;margin-bottom:10px">
......
src/components/FinancialModule/OutstandingAccounts.vue
View file @ aadb3fa6
......@@ -34,9 +34,9 @@
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
:start-placeholder="$t('OrderList.star')"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</li>
<li style="float:right;margin-bottom:10px">
......
src/components/FinancialModule/PlatformAccount/index.vue
View file @ aadb3fa6
......@@ -5,7 +5,7 @@
<ul>
<li v-if="isExamine" style="margin-bottom: 10px;">
<span>
<em>审核状态</em>
<em>{{$t('fnc.shzhuangtai')}}</em>
<el-select v-model="msg.QAccountState" class="w200 HworkInput"
@change="msg.pageIndex==1,getList()">
<el-option v-for="item in QAccountStateList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
......@@ -30,8 +30,8 @@
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button v-if="examineLoading" type="button" class="normalBtn" @click="examineInstitutions(1)">通过</button>
<button v-if="examineLoading" type="button" class="normalBtn" @click="examineInstitutions(2)">驳回</button>
<button v-if="examineLoading" type="button" class="normalBtn" @click="examineInstitutions(1)">{{$t('visa.v_tongguo')}}</button>
<button v-if="examineLoading" type="button" class="normalBtn" @click="examineInstitutions(2)">{{$t('fnc.bohui')}}</button>
<button v-if="examineLoading==false&&isExamine==false" type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
......@@ -72,23 +72,23 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="isLookPlatformAccountPwd">
<el-form-item label="平台密码：" prop="PlatFormPwd">
<el-form-item :label="$t('objFill.pingtaimima')" prop="PlatFormPwd">
<el-input v-model="addMsg.PlatFormPwd" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="平台网址：" prop="PlatFormUrl">
<el-form-item :label="$t('objFill.pingtaiwangzhi')" prop="PlatFormUrl">
<el-input v-model="addMsg.PlatFormUrl" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="保证金单号：" prop="FinanceNo">
<el-form-item :label="$t('objFill.baozhengjdh')" prop="FinanceNo">
<el-input v-model="addMsg.FinanceNo" maxlength="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="合同附件：" prop="ContractArray">
<el-form-item :label="$t('objFill.hetongfujian')" prop="ContractArray">
<div style="display: flex;flex-wrap: wrap;">
<div>
<div class="_info_img" v-if="addMsg.ContractArray&&addMsg.ContractArray.length>0">
......@@ -138,16 +138,16 @@
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="结款时间和方式：" prop="SettlementInfo">
<el-form-item :label="$t('objFill.jiekuansifs')" prop="SettlementInfo">
<el-input v-model="addMsg.SettlementInfo"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同时间：">
<el-form-item :label="$t('objFill.hetongshijian')">
<el-date-picker v-model="addMsg.ContractStartDateInfo"
style="width: 100%;"
type="datetimerange" start-placeholder="开始日期"
end-placeholder="结束日期" size="small" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
type="datetimerange" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" size="small" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -231,7 +231,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="所属线路">
<el-form-item :label="$t('system.table_ssLine')">
<el-select filterable multiple v-model="LineId" collapse-tags
@change="getLineId">
<el-option :label="$t('pub.unlimitedSel')" value="-1"
......@@ -265,17 +265,17 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始本位币金额">
<el-form-item :label="$t('objFill.chuhshibwbje')">
<el-input v-model="addMsg.AccountStartWBMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="初始原币金额">
<el-form-item :label="$t('objFill.chuhshiybje')">
<el-input v-model="addMsg.AccountStartMoney" type="number" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="期初应用日期">
<el-form-item :label="$t('objFill.qichuyyrqi')">
<el-date-picker type="date" v-model="addMsg.BeginTimeStr" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
......@@ -351,10 +351,10 @@
data() {
return {
QAccountStateList:[
{Name:'全部',Id:-1},
{Name:'待审核',Id:0},
{Name:'已审核',Id:1},
{Name:'已拒绝',Id:2},
{Name:this.$t('advmanager.v_all'),Id:-1},
{Name:this.$t('objFill.dsh'),Id:0},
{Name:this.$t('fnc.a_yshenhe'),Id:1},
{Name:this.$t('salesModule.HasRefused'),Id:2},
],
isLookPlatformAccountPwd: false,//账户密码权限
isExamine: false,
......@@ -536,7 +536,7 @@
}],
RiskLimitMoney: [{
required: true,
message: '请输入风险上限',
message: this.$t('objFill.qingshurufxsx'),
trigger: "blur"
}]
},
......@@ -651,7 +651,7 @@
this.addCuren = true
}else if (params.type === 'examine') {
this.editCurency(params.id)
this.text = "审核"
this.text = this.$t('fnc.shenhe')
this.addShow = true
this.examineLoading=true
this.ExamineMsg = {ID:params.id,AccountState:0};
......@@ -821,16 +821,16 @@
};
let accountState = {
field: "AccountState",
title: "状态",
title: this.$t('hotel.hotel_status'),
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 40,
formatter: function (rowData, rowIndex, pagingIndex, field) {
let accountStateStr="";
if(rowData.AccountState==0){accountStateStr="待审核"}
else if(rowData.AccountState==1){accountStateStr="正常"}
else if(rowData.AccountState==2){accountStateStr="已驳回"}
if(rowData.AccountState==0){accountStateStr=that.$t('objFill.dsh')}
else if(rowData.AccountState==1){accountStateStr=that.$t('pub.normalSel')}
else if(rowData.AccountState==2){accountStateStr=that.$t('objFill.yibohui')}
else{accountStateStr=""}
return accountStateStr;
},
......@@ -1246,7 +1246,7 @@
this.GetLocalFile(
"BankAccount_post_OutToExcelPlatform",
msg,
"平台账户.xls"
`${this.$t('fnc.a_ptzhanghu')}.xls`
);
},
addInstitutions() {
......@@ -1254,7 +1254,7 @@
this.addMsg.BranchList = [];
if (!this.addMsg.RiskLimitMoney) {
// this.addMsg.RiskLimitMoney = 0;
this.$message.error('风险上线需大于0');
this.$message.error(this.$t('objFill.fengxiansxxdyl'));
return
}
let msg = {
......
src/components/FinancialModule/PoolAccount.vue
View file @ aadb3fa6
......@@ -275,7 +275,7 @@
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="期初应用日期">
<el-form-item :label="$t('objFill.qichuyyrqi')">
<el-date-picker type="date" v-model="addMsg.BeginTimeStr"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
......
src/components/FinancialModule/ReportForm/AirTicketLoss.vue
View file @ aadb3fa6
......@@ -13,8 +13,8 @@
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
......
src/components/FinancialModule/ReportForm/OrderProfitLossList.vue
View file @ aadb3fa6
......@@ -19,7 +19,7 @@
</el-select>
<div class="block" style="margin-left: 10px;">
<el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="value" type="daterange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
range-separator="至" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" value-format="yyyy-MM-dd"
@change="change" align="right">
</el-date-picker>
</div>
......
src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue
View file @ aadb3fa6
......@@ -37,8 +37,8 @@
v-model="value"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
value-format="yyyy-MM-dd"
@change="change"
align="right"
......
src/components/FinancialModule/ReportForm/onlineRetailersdata.vue
View file @ aadb3fa6
......@@ -13,7 +13,7 @@
<!-- <div class="block" style="margin-left: 10px;">
<el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="value" type="daterange"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
range-separator="至" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" value-format="yyyy-MM-dd"
@change="change" align="right">
</el-date-picker>
</div> -->
......
src/components/FinancialModule/accDetail/GuideAccount.vue
View file @ aadb3fa6
......@@ -115,8 +115,8 @@
v-model="productionDate"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
......@@ -128,8 +128,8 @@
v-model="productionDateByTC"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
......
src/components/FinancialModule/documentsDetail.vue
View file @ aadb3fa6
......@@ -54,9 +54,9 @@
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
:start-placeholder="$t('OrderList.star')"
value-format="yyyy-MM-dd"
end-placeholder="结束日期">
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</li>
<li>
......
src/components/SalesModule/HappyPassbook.vue
View file @ aadb3fa6
......@@ -148,8 +148,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</span>
</li>
......
src/components/SalesModule/PublishvideoList.vue
View file @ aadb3fa6
......@@ -85,8 +85,8 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</span>
</li>
......
src/components/SalesModule/SpecialList.vue
View file @ aadb3fa6
......@@ -100,7 +100,7 @@
</li>
<li>
<span>
<em>审核状态</em>
<em>{{$t('fnc.shzhuangtai')}}</em>
<el-select filterable v-model="msg.ApplyState">
<el-option :label="$t('system.ph_buxian')" :value="-2"></el-option>
<el-option label="拒绝" :value="-1"></el-option>
......
src/components/SalesModule/Videostatistics.vue
View file @ aadb3fa6
......@@ -61,7 +61,7 @@
><em>发布人</em
><el-select class="w180" filterable v-model="msg.CreateBy">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option v-for='item in employeeList'
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
:key='item.empId'>
......@@ -77,12 +77,12 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</span>
</li>
<li>
<input
type="button"
......@@ -90,7 +90,7 @@
:value="$t('pub.searchBtn')"
@click="resetPageIndex(), getList()"
/>
</li>
</ul>
</div>
......@@ -116,7 +116,7 @@
</td>
<!-- <td>{{ item.StartTime | YMD}}</td>
<td>{{ item.EndTime | YMD}}</td> -->
</tr>
<tr v-show="DataList.length==0">
<td colspan="10" align="center">{{$t('system.content_noData')}}</td>
......@@ -184,7 +184,7 @@ export default {
},
DataList:[],
employeeList:[],
};
},
mounted() {
......@@ -208,7 +208,7 @@ export default {
}else{
return date;
}
}
},
......@@ -224,12 +224,12 @@ export default {
}
this.$router.push({
name: 'PublishvideoList',
query: {
CreateBy: item.EmployeeId,
query: {
CreateBy: item.EmployeeId,
StartTime:StartTime,
EndTime:EndTime,
blank: "y",
tab: "视频发布列表"
blank: "y",
tab: "视频发布列表"
}
});
},
......@@ -245,7 +245,7 @@ export default {
if(res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
}, err => {})
}, err => {})
},
getCompany() {
this.apipost(
......@@ -291,7 +291,7 @@ export default {
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
......@@ -318,7 +318,7 @@ export default {
this.currentPage = 1;
},
}
};
</script>
\ No newline at end of file
</script>
src/components/SalesVisa/visaPayment.vue
View file @ aadb3fa6
......@@ -12,8 +12,8 @@
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
:clearable="false"
@change="dateChange">
</el-date-picker>
......
src/components/ShoppingStore/ShoppingReimbursement2.vue
View file @ aadb3fa6
......@@ -260,7 +260,7 @@
data() {
return {
FinanceTypeList:[
// {Name:'全部',Id:0},
// {Name:this.$t('advmanager.v_all'),Id:0},
{Name:'领队佣金',Id:1},
// {Name:'导游佣金',Id:2},
// {Name:'公司佣金',Id:3},
......
src/components/TravelManager/Lxy/directorGoodsList.vue
View file @ aadb3fa6
......@@ -25,8 +25,8 @@
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
<div class="searchInput" style="width:250px;margin-right: 0px;">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:225px;height:30px"
......
src/components/TravelManager/Lxy/directorGuideList.vue
View file @ aadb3fa6
......@@ -43,7 +43,7 @@
</el-select>
<span style="margin-left: 15px">注册时间：</span>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
</div>
......
src/components/TravelManager/Lxy/directorOrderList.vue
View file @ aadb3fa6
......@@ -11,7 +11,7 @@
<div>
<span>下单时间：</span>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
<span style="margin-left:15px">所属平台：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
......
src/components/TravelManager/TravelList/PassengerFeedback.vue
View file @ aadb3fa6
......@@ -42,7 +42,7 @@
<em>发团时间</em>
</span>
<el-date-picker value-format="yyyy-MM-dd" :picker-options="pickerDisabled" size="small" v-model="dateList"
type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
type="daterange" range-separator="至" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
</li>
<li>
......
src/components/TravelManager/TravelList/TravelControlListSaleAduit.vue
View file @ aadb3fa6
......@@ -663,7 +663,7 @@
<tr>
<td colspan="2">
<span>
<button class="normalBtn" style="margin-left:115px;" @click="SetshelvesUp(2)">通过</button>
<button class="normalBtn" style="margin-left:115px;" @click="SetshelvesUp(2)">{{$t('visa.v_tongguo')}}</button>
<button class="normalBtn" style="margin-left:10px;" @click="SetshelvesUp(3)">拒绝</button>
<button class="hollowFixedBtn" @click="queryCommonData.setPlatDialog=false">{{$t('pub.cancelBtn')}}</button>
</span>
......
src/components/TravelManager/customizedcar/costManagement.vue
View file @ aadb3fa6
......@@ -10,7 +10,7 @@
<span>下单时间：</span>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
<span style="margin-left:15px">订单来源：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
......
src/components/TravelManager/customizedcar/travelOrders.vue
View file @ aadb3fa6
......@@ -11,7 +11,7 @@
<div>
<span>下单时间：</span>
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
<span style="margin-left:15px">订单来源：</span>
<el-select class="w120" @change="msg.pageIndex=1,getList()" v-model="msg.OrderSource" size="small"
......
src/components/administrative/Survey.vue
View file @ aadb3fa6
......@@ -32,7 +32,7 @@
<em>发团时间</em>
</span>
<el-date-picker value-format="yyyy-MM-dd" :picker-options="pickerDisabled" size="small" v-model="dateList"
type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
type="daterange" range-separator="至" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')">
</el-date-picker>
</li>
<li>
......
src/components/administrative/WorkOvertime.vue
View file @ aadb3fa6
......@@ -9,47 +9,47 @@
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</span>
</span>
</li>
<li>
<span><em>公司</em>
<el-select @change="getEmployee" filterable clearable v-model='msg.BranchId' :placeholder="$t('pub.unlimitedSel')">
<el-select @change="getEmployee" filterable clearable v-model='msg.BranchId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in companyList'
<el-option v-for='item in companyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</span>
</li>
<li>
<span><em>人员</em>
<el-select filterable clearable v-model='msg.EmployeeId' :placeholder="$t('pub.unlimitedSel')">
<el-select filterable clearable v-model='msg.EmployeeId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in Employee'
<el-option v-for='item in Employee'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span>
</span>
</li>
<li>
<li>
<span><em>离职状态</em>
<el-select filterable clearable v-model='msg.IsLeave' :placeholder="$t('pub.unlimitedSel')">
<el-select filterable clearable v-model='msg.IsLeave' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option label="是" :value='1'></el-option>
<el-option label="否" :value='0'></el-option>
</el-select>
</span>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<!--<input type="button" @click="" class="normalBtn" :value="$t('pub.addBtn')" @click="$router.push('AttendanceRules')"/> -->
</li>
......@@ -61,7 +61,7 @@
<span style="float:right;color:red">注：每天超过19：00算加班，每天按8小时计算</span>
</p>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th>员工编号</th>
<th>{{$t('system.query_name')}}</th>
......@@ -77,16 +77,16 @@
<td>{{item.OffDutyTime}}</td>
<td>{{item.OffResult}}</td>
<td>{{item.Minutes}}</td>
</tr>
</table>
<el-pagination
</tr>
</table>
<el-pagination
background
@current-change="handleCurrentChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:page-size=msg.pageSize
:total=total>
</el-pagination>
</el-pagination>
</div>
</template>
......@@ -94,7 +94,7 @@
<script>
import moment from 'moment'
export default{
data() {
return {
dateList:[],
......@@ -102,7 +102,7 @@ import moment from 'moment'
//分页
total: 0,
pageSize: '',
currentPage: 1,
currentPage: 1,
//请求数据
msg:{
pageIndex:1,
......@@ -116,7 +116,7 @@ import moment from 'moment'
companyMsg:{
RB_Group_Id:"0",
Status:0,
},
},
//返回数据
dataList:[],
companyList:[],
......@@ -124,7 +124,7 @@ import moment from 'moment'
}
},
methods:{
getEmployee(val) { //员工
let str='-1';
if(val){
......@@ -141,13 +141,13 @@ import moment from 'moment'
this.apipost('admin_get_EmployeeGetList', msg, res => {
if(res.data.resultCode == 1) {
this.Employee = res.data.data;
}
}
}, err => {})
},
getCompany(){ //公司
this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
this.companyList = res.data.data;
}, err => {})
}, err => {})
},
getList(){
this.loading=true;
......@@ -157,8 +157,8 @@ import moment from 'moment'
}
else{
this.msg.StartTime=moment().format("YYYY-MM-DD");
this.msg.EndTime=moment().format("YYYY-MM-DD");
this.dateList=[this.msg.StartTime,this.msg.EndTime];
this.msg.EndTime=moment().format("YYYY-MM-DD");
this.dateList=[this.msg.StartTime,this.msg.EndTime];
}
this.apipost('recod_get_GetEmployeeOvertimeHours',this.msg,res=>{
this.loading=false;
......@@ -179,7 +179,7 @@ import moment from 'moment'
this.currentPage=1
},
goUrl (path,id,bId) {
this.$router.push({ name: path,query:{"id":id,"bId":bId} })
this.$router.push({ name: path,query:{"id":id,"bId":bId} })
}
},
created(){
......@@ -191,11 +191,11 @@ import moment from 'moment'
let userInfo=this.getLocalStorage();
this.companyMsg.RB_Group_Id=userInfo.RB_Group_id;//集团
},
}
</script>
<style>
.singeRowTable th{text-align: left; padding-left: 10px;}
.singeRowTable td{text-align: left;padding-left: 10px}
</style>
\ No newline at end of file
</style>
src/components/dmc/manager/GroundingStatistics.vue
View file @ aadb3fa6
......@@ -70,7 +70,7 @@
><em>发布人</em
><el-select class="w150" filterable v-model="msg.EmployeeId">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option v-for='item in employeeList'
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
:key='item.empId'>
......@@ -86,12 +86,12 @@
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</span>
</li>
<li>
<input
type="button"
......@@ -99,7 +99,7 @@
:value="$t('pub.searchBtn')"
@click="resetPageIndex(), getList()"
/>
</li>
</ul>
</div>
......@@ -132,7 +132,7 @@
<span v-if="item.Type==1">新增</span>
<span v-if="item.Type==2">修改</span>
</td>
</tr>
<tr v-show="DataList.length==0">
<td colspan="10" align="center">{{$t('system.content_noData')}}</td>
......@@ -201,7 +201,7 @@ export default {
},
DataList:[],
employeeList:[],
};
},
mounted() {
......@@ -225,7 +225,7 @@ export default {
}else{
return date;
}
}
},
......@@ -241,13 +241,13 @@ export default {
}
this.$router.push({
name: path,
query: {
query: {
StatisticsSTime:StartTime,
StatisticsETime:EndTime,
type:this.msg.Type,
EmployeeId:item.EmployeeId,
blank: "y",
tab: ""
blank: "y",
tab: ""
}
});
},
......@@ -263,7 +263,7 @@ export default {
if(res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
}, err => {})
}, err => {})
},
getCompany() {
this.apipost(
......@@ -335,7 +335,7 @@ export default {
this.currentPage = 1;
},
}
};
</script>
\ No newline at end of file
</script>
src/components/dmc/manager/GroupOutCorporationAudit.vue
View file @ aadb3fa6
......@@ -19,7 +19,7 @@
</li>
<li>
<span>
<em>审核状态</em>
<em>{{$t('fnc.shzhuangtai')}}</em>
<el-select class="w200" v-model="msg.BranchAuditState" filterable :placeholder="$t('pub.pleaseImport')"
size="small" @change="getControlList()">
<el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id" :key="item.Id">
......@@ -39,7 +39,7 @@
<span>
<em>出团日期</em>
<el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd"
size="small" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
size="small" type="daterange" range-separator="至" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')"
@change="getStartTime" clearable>
</el-date-picker>
</span>
......
src/components/leaderPay2.vue
View file @ aadb3fa6
......@@ -1138,8 +1138,8 @@
<input type="button" :value="$t('pub.searchBtn')" class="leader2Btn" @click="czgetList">
</el-form-item>
<el-form-item label="交易日期">
<el-date-picker v-model="czdateList" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker v-model="czdateList" type="daterange" range-separator="至" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</el-form-item>
......
src/components/myOrdersAllType/components/allList.vue
View file @ aadb3fa6
......@@ -89,7 +89,7 @@
<ul>
<li v-if="Title=='审核'">
<span>
<em>审核状态</em>
<em>{{$t('fnc.shzhuangtai')}}</em>
<el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()">
<!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
<el-option v-for='item in TicketStatusList2'
......
src/components/work/mywork.vue
View file @ aadb3fa6
......@@ -269,8 +269,8 @@
type="datetimerange"
class="wd100"
align="right"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
value-format="yyyy-MM-dd HH:mm"
:default-time="['09:30:00', '18:00:00']"
></el-date-picker>
......
src/components/work/workManager.vue
View file @ aadb3fa6
......@@ -72,8 +72,8 @@
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
></el-date-picker>
</span>
</li>
......
src/components/work/workManager2.vue
View file @ aadb3fa6
......@@ -72,8 +72,8 @@
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
></el-date-picker>
</span>
</li>
......
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