Skip to content

S
SuperMan
Commit 5b7ba900 authored by 吴春's avatar 吴春
Browse files
Options

1

parent 524bf6d2
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 71 deletions
src/assets/common/lang/zh.js
View file @ 5b7ba900
......@@ -462,6 +462,7 @@ export const admin={ //行政
hotel_StartDate:'开始日期',
hotel_EndDate:'结束日期',
hotel_Currency:'币种',
Operate:'操作',
hotel_CurrentRate:'汇率',
hotel_UseAmount:'报入人数',
hotel_commission:'返佣',
......
src/assets/common/lang/zhCN/fill.js
View file @ 5b7ba900
......@@ -4244,7 +4244,7 @@ export const obj = {
beizhu3: '凡是填写必须进店的，未进，公社购物金额不足150万及格线，均要填坑补店 10万日元/店',
xinzengfy: '新增费用',
xiugaify: '修改费用',
xinzengqtzc: '新增其它支出',
xinzengqtzc: '新增/编辑其它支出',
fieyongmc: '费用名称',
feiyongjg: '费用价格',
qitazhic: '其它支出',
......
src/components/LeaderManagement/AlipayManagement.vue
View file @ 5b7ba900
......@@ -161,7 +161,7 @@
<tr>
<td>
<el-form-item label="制度有效期" prop="Sort">
<el-date-picker v-model="addMsg.effectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
<el-date-picker value-format="yyyy-MM-dd" v-model="addMsg.effectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
</td>
</tr>
......
src/components/LeaderManagement/AlipayManagementDetail.vue
View file @ 5b7ba900
......@@ -129,14 +129,6 @@
<td>
<template v-if="item.Id&&item.Id>0"> {{item.EffectiveStartDate}}-{{item.EffectiveEndDate}}</template>
</td>
<!-- <td>
<template v-if="item.QuotaTotal&&item.QuotaTotal>0">
<div>可用金额:{{item.QuotaAvailable}}</div>
<div>锁定金额:{{item.QuotaLocked}}</div>
<div>已用金额:{{item.QuotaUsed}}</div>
</template>
<span>刷新</span>
</td> -->
<td v-if="IsEdit==1">
<template v-if="item.Id&&item.Id>0">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
......@@ -170,9 +162,9 @@
<tr>
<td>
<el-form-item label="类型" prop="action">
<el-radio v-model="AddMsgQuota.action" label="1">增加额度</el-radio>
<el-radio v-model="AddMsgQuota.action" label="2">减少额度</el-radio>
<el-radio v-model="AddMsgQuota.action" label="3">删除额度</el-radio>
<el-radio v-model="AddMsgQuota.Action" label="1">增加额度</el-radio>
<el-radio v-model="AddMsgQuota.Action" label="2">减少额度</el-radio>
<el-radio v-model="AddMsgQuota.Action" label="3">删除额度</el-radio>
</el-form-item>
</td>
</tr>
......@@ -231,7 +223,7 @@
<tr>
<td>
<el-form-item label="额度有效期" prop="EffectiveDateList">
<el-date-picker v-model="NewMsgQuota.EffectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
<el-date-picker value-format="yyyy-MM-dd" v-model="NewMsgQuota.EffectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
</td>
</tr>
......@@ -267,7 +259,7 @@
<tr>
<td>
<el-form-item label="制度生效时间" prop="Sort">
<el-date-picker v-model="addMsg.effectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
<el-date-picker value-format="yyyy-MM-dd" v-model="addMsg.effectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
</td>
</tr>
......@@ -385,7 +377,7 @@
InstitutionDesc:"",//费控描述
EffectiveEndDate:"",
EffectiveStartDate:"",
effectiveDateList:[],
effectiveDateList:'',
},
rulesMsg: {
InstitutionName: [{
......@@ -547,7 +539,7 @@
})
},
AlipayEbppInvoiceExpensecontrolQuotaQuery() { //获取用户使用额度情况
this.apipost('alipay_post_AlipayEbppInvoiceExpensecontrolQuotaQuery', {InstitutionId:this.msg.Id}, res => {
this.apipost('alipay_post_AlipayEbppInvoiceExpensecontrolQuotaQuery', {InstitutionId:this.DataList.Id}, res => {
if (res.data.resultCode == 1) {
let RoyaltyList = []
RoyaltyList = res.data.data
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 5b7ba900
......@@ -806,9 +806,10 @@
</tr>
</table>
<!-- 其他支出费用 -->
<!-- <p class="teamRevenueExpenditureTitle">
<template v-if="myLineId==90">
<p class="teamRevenueExpenditureTitle" >
{{$t('objFill.v101.dmc.qitazhic')}}
<span class="fr" style="margin-top: -8px;">
<span class="fr" style="margin-top: -8px;" v-if="DanjuNum==0">
<input type="button" class="normalBtn" :value="$t('objFill.v101.dmc.xinzengqtzc')" @click="addOtherExpenses" />
</span>
</p>
......@@ -820,19 +821,19 @@
<th width="">{{$t('hotel.hotel_Currency')}}</th>
<th width="110">{{$t('system.table_operation')}}</th>
</tr>
<template v-for='(item,index) in TotalNav.leaderOtherExpensesList'>
<tr>
<td>{{item.OtherName}}</td>
<td>{{item.OtherPrice}}</td>
<td>{{item.PayType}}</td>
<td>{{item.CurrencyId}}</td>
<td>{{item.PayTypeName}}</td>
<td>{{item.CurrencyName}}</td>
<td>
<el-button class="normalBtn" type="primary" @click="editorOtherExpenses(item)">{{$t('pub.edit')}}</el-button>
<span @click="editorOtherExpenses(item,index)" class="el-icon-delete itc-delete" v-if="DanjuNum==0"></span>
</td>
</tr>
</template>
</table> -->
</table>
</template>
<p class="teamRevenueExpenditureTitle">
其它
<span class="fr" style="margin-top: -8px;">
......@@ -1012,7 +1013,7 @@
</template>
<template v-else-if="item.CompanyAlipay===1">
<span style="color:red;"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
<span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template>
</template>
</div>
......@@ -1138,29 +1139,33 @@
</el-col>
</el-row>
</el-dialog>
<el-dialog :visible.sync="showOtherExpenses" width="1000px" :title="OtherExpensesTitle" @close="clearMsg()">
<el-dialog :visible.sync="showOtherExpenses" width="1000px" :title="OtherExpensesTitle" @close="clearOtherExpensesMsg()">
<el-form :model="OtherExpensesMsg" ref="OtherExpensesMsg" :rules="rules" label-width="100px">
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0" style="width: 100%;">
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in OtherExpensesMsg.OtherExpensesList">
<div>
<el-form-item
:label="OtherExpensesMsg.OtherExpensesList.length>0?`${$t('objFill.v101.dmc.fieyongmc')} ${index+1} `:` ` "
:prop="`OtherExpensesList.${index}.OtherName`"
<table class="OtherExpensesList" style="width: 100%;">
<tr style="width:100%;">
<th colspan="5" style="color:red !important; ">其它支出<span @click="addOExpenses()" class="el-icon-circle-plus-outline itc-outline"></span></th>
</tr>
<tr style="width:100%;">
<th style="width:50%;">{{$t('objFill.v101.dmc.fieyongmc')}}</th>
<th style="width:20%;">{{$t('objFill.v101.dmc.feiyongjg')}}</th>
<th style="width:10%;">{{$t('fnc.fkfangshi')}}</th>
<th style="width:10%;">{{$t('hotel.hotel_Currency')}}</th>
<th style="width:10%;">{{$t('hotel.Operate')}}</th>
</tr>
<tr v-for="(item,index) in OtherExpensesMsg.OtherExpensesList" :key="index">
<td> <el-form-item :prop="`OtherExpensesList.${index}.OtherName`"
:rules="rules.OtherName">
<el-input v-model="item.OtherName" clearable></el-input>
<el-input v-model="item.OtherName" clearable maxlength="200"></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="OtherExpensesMsg.OtherExpensesList.length>0?`${$t('objFill.v101.dmc.feiyongjg')} ${index+1} `:` ` "
</td>
<td> <el-form-item
:prop="`OtherExpensesList.${index}.OtherPrice`"
:rules="rules.OtherPrice">
<el-input v-model="item.OtherPrice" type="number" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="OtherExpensesMsg.OtherExpensesList.length>0?`${$t('objFill.v101.dmc.feiyongjg')} ${index+1} `:` ` "
</el-form-item></td>
<td>
<el-form-item
:prop="`OtherExpensesList.${index}.PayType`"
:rules="rules.PayType">
<el-select class='w135 sel' v-model='item.PayType' :placeholder="$t('pub.pleaseSel')">
......@@ -1176,29 +1181,28 @@
 <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item
:label="OtherExpensesMsg.OtherExpensesList.length>0?`${$t('objFill.v101.dmc.feiyongjg')} ${index+1} `:` ` "
</td>
<td>
<el-form-item
:prop="`OtherExpensesList.${index}.CurrencyId`"
:rules="rules.CurrencyId">
<el-select v-model="item.CurrencyId" placeholder="请选择币种">
<el-select v-model="item.CurrencyId" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="(items,index) in allCurrencyList" :key="index" :label="items.Name"
:value="items.ID">
</el-option>
</el-select>
<!-- <el-input v-model="item.OtherPrice" type="number"></el-input> -->
</el-form-item>
</div>
<div class="ImpressionTicketing-msg-but">
<span @click="addOExpenses(item,index)" v-if="index==0" class="el-icon-circle-plus-outline itc-outline"></span>
<span @click="deleteOExpenses(index)" v-else class="el-icon-delete itc-delete"></span>
</div>
</div>
</td>
<td>
<span @click="deleteOExpenses(index)" class="el-icon-delete itc-delete"></span>
</td>
</tr>
</table>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="showOtherExpenses = false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="hollowFixedBtn" @click="clearOtherExpensesMsg()">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="submitFormOther('OtherExpensesMsg')" :loading="OtherLoading">{{$t('pub.saveBtn')}}</el-button> &nbsp;
</div>
</el-dialog>
......@@ -1281,6 +1285,7 @@
UseTotalPrice:0,
OtherExpensesTitle: '',
showOtherExpenses: false,
DanjuNum:0,
OtherExpensesObj: {
ID:0,
OtherName:'',
......@@ -1290,13 +1295,13 @@
},
OtherExpensesMsg: {
OtherExpensesList: [
{
ID:0,
OtherName:'',
OtherPrice:'',
PayType:'',
CurrencyId:''
},
// {
// ID:0,
// OtherName:'',
// OtherPrice:'',
// PayType:'',
// CurrencyId:''
// },
],
TCID: 0,
},
......@@ -1343,6 +1348,7 @@
this.$refs['OtherExpensesMsg'].resetFields();
this.showOtherExpenses = false;
this.Success(res.data.message)
this.clearOtherExpensesMsg();
} else {
this.Error(res.data.message)
}
......@@ -1360,13 +1366,49 @@
this.OtherExpensesMsg.OtherExpensesList.splice(index,1)
},
addOtherExpenses() {
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.xinzengqtzc')
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.xinzengqtzc');
if(this.TotalNav.leaderOtherExpensesList&&this.TotalNav.leaderOtherExpensesList.length>0){
this.OtherExpensesMsg.OtherExpensesList=JSON.parse(JSON.stringify(this.TotalNav.leaderOtherExpensesList))
}
this.showOtherExpenses = true
},
editorOtherExpenses(item) {
this.OtherExpensesMsg = JSON.parse(JSON.stringify(item))
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.bianjiqizc')
this.showOtherExpenses = true
editorOtherExpenses(item,index) {
this.$confirm(this.$t('objFill.ydscbkhf'), this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
type: "warning"
}
)
.then(() => {
this.OtherExpensesMsg.OtherExpensesList=[];
this.OtherExpensesMsg.TCID = this.msg.TCIDs = this.$route.query.id;
if(this.TotalNav.leaderOtherExpensesList&&this.TotalNav.leaderOtherExpensesList.length>0){
this.OtherExpensesMsg.OtherExpensesList=JSON.parse(JSON.stringify(this.TotalNav.leaderOtherExpensesList))
}
if(this.OtherExpensesMsg.OtherExpensesList&&this.OtherExpensesMsg.OtherExpensesList.length>0){
this.OtherExpensesMsg.OtherExpensesList.splice(index, 1);
}
this.apipost(
'dmcstatistics_post_SetOtherExpenses', this.OtherExpensesMsg,
res => {
if (res.data.resultCode == 1) {
this.getTotalNav()
this.Success('删除成功')
this.clearOtherExpensesMsg();
} else {
this.Error(res.data.message)
}
this.OtherLoading = false
},
err => {}
)
})
.catch(() => {
return false;
});
// this.OtherExpensesMsg = JSON.parse(JSON.stringify(item))
// this.OtherExpensesTitle = this.$t('objFill.v101.dmc.bianjiqizc')
// this.showOtherExpenses = true
},
//用款计划下载
downloadMoneyPlan() {
......@@ -1820,6 +1862,10 @@
}
})
}
if (this.msgCompanyAlipay.EffectiveDateList && this.msgCompanyAlipay.EffectiveDateList.length > 0) {
this.msgCompanyAlipay.EffectiveStartDate = this.msgCompanyAlipay.EffectiveDateList[0];
this.msgCompanyAlipay.EffectiveEndDate = this.msgCompanyAlipay.EffectiveDateList[1];
}
if(leaderGetPrice>Number(this.UseTotalPrice)){
this.Error("总额度不能超过"+this.UseTotalPrice);
return;
......@@ -1857,9 +1903,14 @@
this.msgCompanyAlipay.InstitutionName="";
this.msgCompanyAlipay.InstitutionDesc="";
this.$refs['companyalipay'].clearMsg()
},
clearOtherExpensesMsg(){
this.showOtherExpenses=false;
this.OtherExpensesMsg.TCID=0;
this.OtherExpensesMsg.OtherExpensesList=[];
},
OpenCompanyAlipay(obj, num, leadr, cur){
console.log("OpenCompanyAlipay-->obj:",obj);
let totailMoney = (Number(leadr.LeaderGetPriceT) + Number(cur.yiLing)).toFixed(2);
let leadrPlanPrice = 0;
if (leadr && leadr.PlanPrice) {
......@@ -1888,7 +1939,6 @@
return;
}
}
if (this.list.hotelNoSureInfo !== "") {
this.CompanyAlipayTCID=obj.TCIDS;
this.ShowCompanyAlipay=true;
this.TeamStartDateList=[];
......@@ -1901,7 +1951,6 @@
this.TeamStartDateList.push(Y + M + D);
this.UseTotalPrice=leadr.LeaderGetPriceT;
console.log("CompanyAlipayTCID222",this.CompanyAlipayTCID);
}
},
addOtherList(index, id) {
this.list.OtherOrderReportList.OtherList.push({
......@@ -2083,6 +2132,7 @@
res => {
if (res.data.resultCode == 1) {
let nav = res.data.data.list;
this.DanjuNum=res.data.data.DanjuNum;
this.LineId = res.data.data.EntryId;
if (nav[0].OutBranchId == 1216 || this.myLineId == 90) {
this.IsShowRMB = true;
......@@ -2935,5 +2985,26 @@
.cursor-pointer {
cursor: pointer;
}
table.OtherExpensesList {
font-family: verdana,arial,sans-serif;
font-size:11px;
color:#333333;
border: 1px solid #DCDFE6;
border-collapse: collapse;
}
/* table.OtherExpensesList th:first {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
} */
table.OtherExpensesList th {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
}
table.OtherExpensesList td {
border: 1px solid #DCDFE6;
padding: 8px;
background-color: #ffffff;
}
</style>
src/components/commonPage/companyalipay.vue
View file @ 5b7ba900
......@@ -41,6 +41,13 @@ table.companyalipay {
</el-col>
</el-row>
<el-row :gutter="20">
<el-col >
<el-form-item label="制度有效期" prop="EffectiveDateList">
<el-date-picker value-format="yyyy-MM-dd" v-model="msg.EffectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col >
<el-form-item label="员工" prop="EmployeeIdList">
<el-select
......@@ -78,7 +85,7 @@ table.companyalipay {
<el-radio v-model="item.ShareMode" label="1">是</el-radio>
</td>
<td>
<el-date-picker v-model="item.effectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
<el-date-picker value-format="yyyy-MM-dd" v-model="item.effectiveDateList" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</td>
</tr>
</table>
......@@ -107,6 +114,9 @@ export default {
QuotaCreateList: [],
InstitutionName: "",//支付名称 20
InstitutionDesc: "", //制度描述 200
EffectiveDateList:[],
EffectiveEndDate:"",
EffectiveStartDate:"",
//StandardName: "", //规则名称 string(20)
// RuleName: "", //费控条件名称 string(32)
},
......@@ -122,6 +132,12 @@ export default {
trigger: 'change',
type: 'array',
}],
EffectiveDateList: [{
required: true,
message: "请选择制度有效期",
trigger: 'blur',
type: 'array',
}],
},
}
},
......@@ -140,7 +156,10 @@ export default {
this.msg.EmployeeIdList=[];
this.msg.QuotaCreateList=[];
this.msg.InstitutionName="";
this.msg.EffectiveDateList=[];
this.msg.InstitutionDesc="";
this.msg.EffectiveEndDate="";
this.msg.EffectiveStartDate="";
},
AddQuotaCreate() {
if(this.msg.EmployeeIdList&&this.msg.EmployeeIdList.length>0){
......@@ -204,6 +223,7 @@ export default {
this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.msg.EmployeeIdList=[];
this.EmployeeList=[];
this.msg.EffectiveDateList=this.TeamStartDateList;
this.getEmployee();
}
}
......
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