Skip to content

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

其他支出费用

parent 23611a2f
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 11 deletions
src/assets/common/lang/EN/fill.js
View file @ f22c6fbb
......@@ -1773,7 +1773,7 @@ export const obj = {
fukuanzhanghao: 'Payment Account',
qinggouxuan: 'Please check',
xuyaofkdsj: 'Need payment data!',
Bizhongs: ['Yen','Yuan','Dollar','Won','Euro','Sterling','Hong Kong dollar','Canadian dollar','Australian dollar','New Zealand dollar','New Taiwan Dollar','Thai baht','Singapore Dollar','Swiss franc'],
Bizhongs: ['Yen','Yuan','Dollar','Won','Euro','Sterling','Hong Kong dollar','Canadian dollar','Australian dollar','New Zealand dollar','New Taiwan Dollar','Thai baht','Singapore Dollar','Swiss franc', 'Vietnamese Dong'],
zonglkbnc: 'The total amount cannot exceed',
shifouqzd: 'Do you want to make a document?',
darens: ['adult','human','small'],
......
src/assets/common/lang/zhCN/fill.js
View file @ f22c6fbb
......@@ -4216,7 +4216,40 @@ export const obj = {
yikqqydf: '已开启企业代付',
yujiykxz: '预计用款下载',
quxchdd: '取消印象车行订单',
}
shifouqr: '是否确认',
dianjqxchdd: '点击取消印象车行订单',
quxiaosj: '取消时间',
qingxzctrq: '请选择出团日期',
qingxzbcyy: '选择出团时间范围不能超过一个月',
tuanyjykxz: '团预计用款下载',
faburen: '发布人',
jiudsl: '酒店数量',
cantsl: '餐厅数量',
jingdsl: '景点数量',
daoyoujhb: '导游计划表',
chutrq: '出团日期',
shengqyy: '申请原因',
yuanchutgs: '原出团公司',
xinchutgs: '新出团公司',
qingtxbtyy: '请填写驳回该团的缘由',
quedinbh: '确定驳回',
shifshtggt: '是否审核通过该团?',
qingsrbhyy: '请输入驳回缘由',
shifoubhgt: '是否驳回该团?',
linduijjb: '领队交接表',
yinxyjhzd: '印象佣金回执单（每团必填，交回领队，带回公司）',
gongshe: '公社',
beizhu1: '公司规定严禁进秋叶原TOKIS,浅草TOKIS（东京电器） 凡私下丢名单进此两店，导游罚款50万日元，领队回国不报佣金全部停发，并且永不录用！！',
beizhu2: '公司规定永山银座店严禁私下丢名单！！ 银座必须进乐天，选择LOAX！！ 同备注1 政策。',
beizhu3: '凡是填写必须进店的，未进，公社购物金额不足150万及格线，均要填坑补店 10万日元/店',
xinzengfy: '新增费用',
xiugaify: '修改费用',
xinzengqtzc: '新增其它支出',
fieyongmc: '费用名称',
feiyongjg: '费用价格',
qitazhic: '其它支出',
bianjiqizc: '编辑其他支出',
}
}
//#endregion
}
......
src/components/FinancialModule/refundQuery.vue
View file @ f22c6fbb
......@@ -31,7 +31,7 @@
</li>
<li>
<span>
<em>支付方式</em>
<em>{{$t('objFill.zffs')}}</em>
<el-select v-model="msg.Pay_Way" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option>
......@@ -101,7 +101,7 @@
<tr>
<th width="250">平台单号</th>
<th width="100">{{$t('fnc.jine')}}</th>
<th>支付方式</th>
<th>{{$t('objFill.zffs')}}</th>
<th>支付日期</th>
<th>{{$t('hotel.hotel_status')}}</th>
<th>退款金额</th>
......
src/components/LeaderManagement/CarDetails.vue
View file @ f22c6fbb
......@@ -14,7 +14,7 @@
<th>{{$t('system.query_dest')}}</th>
<th>实付金额</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>支付方式</th>
<th>{{$t('objFill.zffs')}}</th>
<th style="width:150px;">附件</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
......
src/components/LeaderManagement/DinningDetails.vue
View file @ f22c6fbb
......@@ -13,7 +13,7 @@
<th>{{$t('fnc.jine')}}</th>
<th>实付金额</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>支付方式</th>
<th>{{$t('objFill.zffs')}}</th>
<th>附件</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
......
src/components/LeaderManagement/leaderPayHotelDetail.vue
View file @ f22c6fbb
......@@ -13,7 +13,7 @@
<th>数量</th>
<th>单价/人</th>
<th>{{$t('objFill.jingexj')}}</th>
<th>支付方式</th>
<th>{{$t('objFill.zffs')}}</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>附件</th>
<th>{{$t('pub.pubRemark')}}</th>
......
src/components/LeaderManagement/leaderPayTicketDetail.vue
View file @ f22c6fbb
......@@ -13,7 +13,7 @@
<th>数量</th>
<th>单价/人</th>
<th>{{$t('objFill.jingexj')}}</th>
<th>支付方式</th>
<th>{{$t('objFill.zffs')}}</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>附件</th>
<th>{{$t('pub.pubRemark')}}</th>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ f22c6fbb
......@@ -805,6 +805,34 @@
</td>
</tr>
</table>
<!-- 其他支出费用 -->
<!-- <p class="teamRevenueExpenditureTitle">
{{$t('objFill.v101.dmc.qitazhic')}}
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" :value="$t('objFill.v101.dmc.xinzengqtzc')" @click="addOtherExpenses" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th >{{$t('objFill.v101.dmc.fieyongmc')}}</th>
<th>{{$t('objFill.v101.dmc.feiyongjg')}}</th>
<th>{{$t('objFill.zffs')}}</th>
<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>
<el-button class="normalBtn" type="primary" @click="editorOtherExpenses(item)">{{$t('pub.edit')}}</el-button>
</td>
</tr>
</template>
</table> -->
<p class="teamRevenueExpenditureTitle">
其它
<span class="fr" style="margin-top: -8px;">
......@@ -1110,6 +1138,70 @@
</el-col>
</el-row>
</el-dialog>
<el-dialog :visible.sync="showOtherExpenses" width="1000px" :title="OtherExpensesTitle" @close="clearMsg()">
<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`"
:rules="rules.OtherName">
<el-input v-model="item.OtherName" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item
:label="OtherExpensesMsg.OtherExpensesList.length>0?`${$t('objFill.v101.dmc.feiyongjg')} ${index+1} `:` ` "
: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} `:` ` "
:prop="`OtherExpensesList.${index}.PayType`"
:rules="rules.PayType">
<el-select class='w135 sel' v-model='item.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('ground.xianfu')" :value='1'></el-option>
<el-option :label="$t('ground.qiandan')" :value='2'></el-option>
<el-option :label="$t('ground.shiwudk')" :value='3'></el-option>
<el-option :label="$t('ground.yufu')" :value='4'></el-option>
<el-option :label="$t('ground.yufukuandk')" :value='5'></el-option>
<el-option :label="$t('ground.yuejie')" :value='9'></el-option>
<el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option :label="$t('ground.shuaka')" :value='11'></el-option>
<el-option :label="$t('objFill.zhuanzhang')" :value='14'></el-option>
 <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} `:` ` "
:prop="`OtherExpensesList.${index}.CurrencyId`"
:rules="rules.CurrencyId">
<el-select v-model="item.CurrencyId" placeholder="请选择币种">
<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>
</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="normalBtn" type="primary" @click="submitFormOther('OtherExpensesMsg')" :loading="OtherLoading">{{$t('pub.saveBtn')}}</el-button> &nbsp;
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -1187,6 +1279,51 @@
msgCompanyAlipay: {},
TeamStartDateList:[],
UseTotalPrice:0,
OtherExpensesTitle: '',
showOtherExpenses: false,
OtherExpensesObj: {
ID:0,
OtherName:'',
OtherPrice:'',
PayType:'',
CurrencyId:''
},
OtherExpensesMsg: {
OtherExpensesList: [
{
ID:0,
OtherName:'',
OtherPrice:'',
PayType:'',
CurrencyId:''
},
],
TCID: 0,
},
rules: {
OtherName: [{
required: true,
message: '请输入费用名称',
trigger: "blur"
}],
OtherPrice: [{
required: true,
message: '请输入费用价格',
trigger: "blur"
}],
PayType: [{
required: true,
message: '请选择支付方式',
trigger: "change"
}],
CurrencyId: [{
required: true,
message: '请选择币种',
trigger: "change"
}],
},
allCurrencyList: [],
OtherLoading: false,
};
},
components: {
......@@ -1194,6 +1331,43 @@
companyalipay
},
methods: {
submitFormOther(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.OtherLoading = true
this.apipost(
'dmcstatistics_post_SetOtherExpenses', this.OtherExpensesMsg,
res => {
if (res.data.resultCode == 1) {
this.getTotalNav()
this.$refs['OtherExpensesMsg'].resetFields();
this.showOtherExpenses = false;
this.Success(res.data.message)
} else {
this.Error(res.data.message)
}
this.OtherLoading = false
},
err => {}
)
}
})
},
addOExpenses(){
this.OtherExpensesMsg.OtherExpensesList.push(JSON.parse(JSON.stringify(this.OtherExpensesObj)))
},
deleteOExpenses(index){
this.OtherExpensesMsg.OtherExpensesList.splice(index,1)
},
addOtherExpenses() {
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.xinzengqtzc')
this.showOtherExpenses = true
},
editorOtherExpenses(item) {
this.OtherExpensesMsg = JSON.parse(JSON.stringify(item))
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.bianjiqizc')
this.showOtherExpenses = true
},
//用款计划下载
downloadMoneyPlan() {
var fileName = "test";
......@@ -1469,6 +1643,7 @@
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
this.allCurrencyList = data
data.forEach(item => {
this.currencyTypeObj[item.ID] = item.Name;
});
......@@ -2021,7 +2196,9 @@
},
res => {
if (res.data.resultCode == 1) {
console.log(res.data.data,'-------')
this.TotalNav = res.data.data;
this.getNav();
} else {
this.Error(res.data.message);
......@@ -2350,7 +2527,7 @@
},
mounted() {
this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id;
this.OtherExpensesMsg.TCID = this.msg.TCIDs = this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.myLineId = this.$route.query.lineId;
if (this.myLineId == 14) { //日本线95%
......@@ -2374,7 +2551,27 @@
</script>
<style>
<style scoped>
.itc-delete{
color: #E95252;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.itc-outline{
color: #409EFF;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.ImpressionTicketing-msgbox{
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 20px;
}
.teamRevenueExpenditureTitle {
border-left: 3px solid #E95252;
text-indent: 10px;
......
src/components/systemManagement/HuichaImport_Back240930.vue
View file @ f22c6fbb
......@@ -128,7 +128,7 @@
<th>出团公司</th>
<th>团号</th>
<th>原币金额</th>
<th>币种</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
......
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