Skip to content

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

页面修改

parents 49078567 dbb48492
Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 230 deletions
src/App.vue
View file @ ea6c25c8
......@@ -326,7 +326,9 @@
float: left;
}
.width100-float-l{
width: 100%;
float: left;
}
.width100-float-l+.width100-float-l{
margin-left: 10px;
}
</style>
src/components/FinancialModule/FinancialDocuments.vue
View file @ ea6c25c8
......@@ -1171,15 +1171,12 @@ input[type="number"] {
</div>
</template>
</el-dialog>
<el-dialog title="修改单据手续费" width="300px"
:visible.sync="transactionTax" center :before-close="closeChangeMachie">
<p style="font-size:12px;margin-bottom:10px;">交易手续费：</p>
<el-input v-model="transTax.Fee" placeholder="请输入内容"></el-input>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="transactionTax=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="saveTransTaxMoney" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<!-- 修改手续费 -->
<template v-if="transactionTax">
<shouxufei :transTax="transTax"
@success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
</template>
<el-dialog title="修改付款对象" width="300px"
:visible.sync="PaymentSync" center :before-close="closeChangeMachie">
<el-form class="cdForm" label-width="90px">
......@@ -1319,6 +1316,7 @@ import myBill from "./FinancialSubmodule/BillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
import shouxufei from "./components/shouxufei.vue";
export default {
data() {
return {
......@@ -1562,7 +1560,8 @@ export default {
"my-Bill": myBill,
"my-RVB-Bill": myrbvBill,
"my-HB-Bill": myhrBill,
"my-GZ-Bill": myGZBill
"my-GZ-Bill": myGZBill,
shouxufei
},
mounted() {
let StartDate = this.getBeforeDate(186,new Date().Format("yyyy-MM-dd"))
......@@ -2743,6 +2742,9 @@ export default {
});
}
},
close(){
this.transactionTax = false
},
showjiaoyi(FrId) {
//弹出交易方式修改
this.apipost(
......@@ -2795,8 +2797,6 @@ export default {
},
showTranTax(fid,type) {
this.transTax.FrId = fid;
this.transTax.loading = false;
if(type==1){
this.transTax.Fee = "0.00";
this.transactionTax = true;
......@@ -2806,30 +2806,6 @@ export default {
this.PaymentSync = true
}
},
saveTransTaxMoney() {
if (this.transTax.loading) return;
this.transTax.loading = true;
if (this.transTax.Fee && this.transTax.Fee != "") {
this.apipost(
"Financial_post_UpdateFinanceFee",
{ FrId: this.transTax.FrId, Fee: this.transTax.Fee },
res => {
if (res.data.resultCode == 1) {
this.$message.success("修改成功");
this.getPageList();
this.transactionTax = false;
}
this.transTax.loading = false;
},
err => {
this.transTax.loading = false;
}
);
} else {
this.transTax.loading = false;
this.$message.error("请输入手续费");
}
},
getAccountList2(AccountTypeId, y) {
//获取账户类型对应下的账户列表
this.alltransaction.map(x => {
......
src/components/FinancialModule/OPExtraReward/CommissionRule.vue
View file @ ea6c25c8
......@@ -26,6 +26,10 @@
<th width="100" style="min-width: 100px;max-width: 100px;">方案名称</th>
<th width="200" class="left-text-indent">线路</th>
<th width="100">提成方式</th>
<th width="100">单签提成比</th>
<th width="100">团签奖励</th>
<th width="100">团签助奖</th>
<th width="100">单/落助人头奖</th>
<th width="150" style="min-width: 150px;max-width: 150px;">修改时间</th>
<th width="150" style="min-width: 150px;max-width: 150px;">操作</th>
</tr>
......@@ -39,6 +43,16 @@
<td style="padding: 0 10px;">
{{item.SingleVisaWay==1?'人头奖励':item.SingleVisaWay==2?'利润比':'-'}}
</td>
<td>
<span v-if="item.FSingleVisaMoney">总公司：</span>{{item.SingleVisaRate}}{{item.SingleVisaWay==1?'/人':item.SingleVisaWay==2?'%':'-'}}
<div v-if="item.FSingleVisaMoney">分公司：{{item.FSingleVisaMoney}}/人</div>
</td>
<td>
<span v-if="item.FTravelVisaMoney">总公司：</span> {{item.TravelVisaMoney}}/人
<div v-if="item.FTravelVisaMoney">分公司：{{item.FTravelVisaMoney}}/人</div>
</td>
<td>{{item.TravelVisaZLMoney}}/人</td>
<td>{{item.SingleZLMoney}}/人</td>
<td style="padding: 0 10px;">
<p>{{item.UpdateBy}}</p>
<span>
......@@ -128,7 +142,7 @@
style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
>暂无数据</div>
<el-dialog :title="titleName" :visible.sync="ruleVisible" width="750px" @close="resetForm('form')">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div class="titleOP">总公司OP提成</div>
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
......@@ -179,6 +193,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单/落助人头奖" prop="SingleZLMoney">
<div class="Impression-ratio-box">
<el-input type="Number" v-model="form.SingleZLMoney" clearable></el-input>
<span class="Impression-ratio-right">/人</span>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags
......@@ -293,7 +315,7 @@
<div class="titleOP">分公司OP提成</div>
<div class="ImpressionTicketing-msgbox bottom0">
<el-row>
<el-col :span="8" v-if="form.SingleVisaWay">
<el-col :span="8">
<el-form-item label="单签人头奖" prop="FSingleVisaMoney"
:rules="form.SingleVisaWay==1?rules.SingleVisaRate2:rules.SingleVisaRate">
<div class="Impression-ratio-box">
......@@ -490,6 +512,11 @@
message: '请输入分公司团签奖励',
trigger: 'blur'
}],
SingleZLMoney: [{
required: true,
message: '请输入单项/落地散助理人头奖励',
trigger: 'blur'
}],
},
ProfitList:
{
......@@ -555,7 +582,8 @@
],
IsEnableFBranch: 0,
FSingleVisaMoney: 0,
FTravelVisaMoney: 0
FTravelVisaMoney: 0,
SingleZLMoney: 0,
},
ruleLoading: false,
ruleVisible:false,
......@@ -641,7 +669,8 @@
FProfitList: item.FProfitList&&item.FProfitList.length>0?item.FProfitList:item.IsEnableFBranch>0?[this.FProfitList]:[],
FExtraList: item.FExtraList&&item.FExtraList.length>0?item.FExtraList:[this.FExtraList],
FSingleVisaMoney: item.FSingleVisaMoney,
FTravelVisaMoney: item.FTravelVisaMoney
FTravelVisaMoney: item.FTravelVisaMoney,
SingleZLMoney: item.SingleZLMoney,
}
},
Delete(item){//删除
......
src/components/FinancialModule/RecPayQuery.vue
View file @ ea6c25c8
......@@ -56,7 +56,7 @@
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01}
.zhuiClass{
}
.singeRowTable tr:hover{background-color: white}
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
......@@ -329,7 +329,6 @@
:table-data="DataList"
:filter-method="filterMethod"
:row-height='100'
@on-custom-comp="customCompFunc"
@sort-change="sortChange"
multiple-sort><!-- 多个排序 -->
......@@ -340,7 +339,7 @@
:pageIndex='pageIndex' -->
<el-pagination background @current-change="handleCurrentChanges"
layout="total,prev, pager, next, jumper" :page-size="pageSize" :total='total'>
</el-pagination>
</el-pagination>
</div>
</div>
......@@ -388,7 +387,7 @@
</el-select>
</p>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="costmode=false">{{$t('pub.cancelBtn')}}</el-button>
......@@ -424,12 +423,18 @@
<el-button class="normalBtn" type="primary" @click="preservetransactionHL()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<!-- 修改手续费 -->
<template v-if="transactionTax">
<shouxufei :transTax="transTax"
@success="close(),resetPageIndex(),getPageList()" @close="close"></shouxufei>
</template>
</div>
</template>
<script>
import myBill from "./FinancialSubmodule/BillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import shouxufei from "./components/shouxufei.vue";
import Vue from 'vue'
// 自定义列组件
Vue.component('table-BranchName',{ //查看操作按钮
......@@ -490,7 +495,7 @@ Vue.component('table-operation',{ //查看操作按钮
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<i v-if="rowData.isExchange" style="width: 30px;
<i v-if="rowData.isExchange" style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
......@@ -532,9 +537,25 @@ Vue.component('table-operation',{ //查看操作按钮
outline: none;" class="iconfont icon-money" v-if="F_Update_CurrencyRate==true && (rowData.Type==2 || rowData.Type==1)" @click="editRate(rowData)">
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改手续费" placement="top">
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-money"
v-if="rowData.Type==1&&(istransaction == true || isJapanCommission == true)"
@click="editCommission(rowData)">
</i>
</el-tooltip>
</span>`,
props:{
rowData:{
type:Object
},
......@@ -548,7 +569,9 @@ Vue.component('table-operation',{ //查看操作按钮
data(){
return{
Finance_ExpenseType:false,
F_Update_CurrencyRate:false
F_Update_CurrencyRate:false,
istransaction: false,
isJapanCommission: false
}
},
created(){
......@@ -561,6 +584,12 @@ Vue.component('table-operation',{ //查看操作按钮
if(ActionMenuCode.indexOf('F_Update_CurrencyRate')!=-1){
this.F_Update_CurrencyRate=true;
}
if (ActionMenuCode.indexOf("F_Trademodify") != -1) {
this.istransaction = true;
}
if(userinfo.RB_Branch_id == 1218&&ActionMenuCode.indexOf('isJapanCommission')!=-1){
this.isJapanCommission=true;
}
},
methods:{
goUrl(path){
......@@ -583,6 +612,9 @@ Vue.component('table-operation',{ //查看操作按钮
editRate(rowData){
this.MsgBus.$emit('showhuilv',rowData);
},
editCommission(rowData){
this.MsgBus.$emit('shouxufei',rowData);
},
}
})
Vue.component('table-RecPay',{ //收支样式
......@@ -602,7 +634,7 @@ Vue.component('table-RecPay',{ //收支样式
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
收入
</span>
<span v-if="rowData.Type==5" style="display: inline-block;
padding: 2px 8px;
......@@ -916,6 +948,14 @@ Vue.component('table-StatusStr',{ //单据状态
export default {
data(){
return{
transTax:{
FrId: 0,
Fee: "0.0",
loading: false,
ClientType:'',
ClientID:''
},
transactionTax: false,
showID:false,
active:1,
userId:0,
......@@ -1094,6 +1134,7 @@ export default {
},components: {
"my-Bill": myBill,
"my-RVB-Bill":myrbvBill,
shouxufei
},mounted(){
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
......@@ -1126,6 +1167,9 @@ export default {
that.MsgBus.$on('showhuilv',function(row){
that.showhuilv(row)
})
that.MsgBus.$on('shouxufei',function(row){
that.shouxufei(row)
})
},methods:{
customCompFunc(params){
},
......@@ -1175,7 +1219,7 @@ export default {
}
},err=>{})
},
getPageList(){ // 获取列表数据
getPageList(){ // 获取列表数据
if(!this.msg.ClientID)this.msg.ClientID=0;
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
......@@ -1403,7 +1447,7 @@ export default {
}
}, err => {})
}
},
Financial_post_GetBranchAccountList(){ //获取交易方式列表
this.apipost('Financial_post_GetBranchAccountList',{}, res => {
......@@ -1562,6 +1606,13 @@ export default {
}
}, err => {})
},
shouxufei(row){
this.transTax.FrId = row.FrID;
this.transactionTax = true
},
close(){
this.transactionTax = false
},
showhuilv(row){
this.apipost('Financial_get_GetFinanceRate', {FinanceId:row.FrID}, res => {
if (res.data.resultCode == 1) {
......
src/components/FinancialModule/TradeCommission/commissionDialog.vue
View file @ ea6c25c8
......@@ -135,6 +135,9 @@
RB_Department_Id: -1,//部门ID
RB_Branch_Id: -1,//公司ID
OutBranchId: -1,//出团公司ID
EmployeeId: -1,
Way: -1,
TCID: '',
},
dataList:[],
outerVisible:false,//提成比例弹窗
......@@ -146,6 +149,7 @@
handler(val, oldVal) {
this.objNew = val
this.msg.OrderId = val.id?val.id:val.OrderId?val.OrderId:val.orderId
this.msg.TCID = this.msg.OrderId
this.msg.PeriodId = this.$route.query.PeriodId?this.$route.query.PeriodId:-1
},
deep: true,
......@@ -202,25 +206,9 @@
},
// op提成
GetNewOPCommission(){
let msg = {
pageIndex: 1,
pageSize: 5,
EmployeeId: -1,
PeriodsId: -1,
OrderType: -1,
Way: -1,
TCID: this.objNew.OrderId,
TCNUM: '',
RB_Department_Id: -1,//部门ID
EmBranchId: -1,//公司ID
RB_Branch_Id: -1,//出团公司ID
}
if (msg.TCID == '') {
msg.TCID = 0
}
this.apipost(
"opcommission_GetNewOPCommissionDetailsPageList",
msg,
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
......
src/components/FinancialModule/components/shouxufei.vue 0 → 100644
View file @ ea6c25c8
<template>
<div>
<el-dialog title="修改单据手续费" width="300px"
:visible.sync="transactionTax" center @close="close">
<p style="font-size:12px;margin-bottom:10px;">交易手续费：</p>
<el-input v-model="ObjData.Fee" placeholder="请输入内容"></el-input>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="saveTransTaxMoney" :loading="ObjData.loading">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
props: ['transTax'],
data() {
return {
transactionTax: true,
ObjData:{
FrId: 0,
Fee: "0.0",
loading: false,
ClientType:'',
ClientID:''
}
};
},
watch: {
transTax:{
handler(val, oldval) {
this.ObjData = JSON.parse(JSON.stringify(val))
},
deep: true,
immediate: true
}
},
methods: {
saveTransTaxMoney() {
if (this.ObjData.loading) return;
this.ObjData.loading = true;
if (this.ObjData.Fee && this.ObjData.Fee != "") {
this.apipost(
"Financial_post_UpdateFinanceFee",
{ FrId: this.ObjData.FrId, Fee: this.ObjData.Fee },
res => {
if (res.data.resultCode == 1) {
this.$message.success("修改成功");
this.$emit('success')
}
this.ObjData.loading = false;
},
err => {
this.ObjData.loading = false;
}
);
} else {
this.ObjData.loading = false;
this.$message.error("请输入手续费");
}
},
close(){
this.$emit('close')
},
},
mounted() {
}
};
</script>
<style>
</style>
src/components/SalesModule/MyCustomer.vue
View file @ ea6c25c8
......@@ -574,132 +574,133 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="統一编号" prop="UniqueCode">
<el-input v-model="addMsg.UniqueCode" placeholder="请输入統一编号" maxlength="20"></el-input>
<el-input v-model="addMsg.UniqueCode" placeholder="请输入統一编号"
maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="LINE ID" prop="LINEID">
<el-input v-model="addMsg.LINEID" placeholder="请输入LINE ID" maxlength="20"></el-input>
<el-input v-model="addMsg.LINEID" placeholder="请输入LINE ID"
maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="Email" prop="Email">
<el-input v-model="addMsg.Email" placeholder="请输入Email" style="width: 240px;"></el-input>
<span class="q-pl-lg text-grey-8" style="cursor: pointer;margin-left: 10px;color: gray;"
@click="isShow=!isShow">{{isShow?'收起':'展开'}}</span>
<span class="q-pl-lg text-grey-8" style="cursor: pointer;margin-left: 10px;color: gray;" @click="isShow=!isShow">{{isShow?'收起':'展开'}}</span>
</el-form-item>
</el-col>
</el-row>
<template>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerSource')" prop="CustomerSourceType">
<el-select filterable v-model='addMsg.CustomerSourceType' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in khly' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.Belongbrand')" prop="brandIds">
<el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds'
:placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in CustomerBrandList' :label='item.name' :value='item.id' :key='item.id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('visaT.post')" prop="Duty">
<el-select filterable v-model='addMsg.Duty' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in zw' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.premises')" prop="Premises">
<el-select filterable v-model='addMsg.Premises' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in jycs' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签约月结客户" prop="SigningType">
<el-checkbox v-model='addMsg.SigningType'>
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签约资料" prop="SigningFile">
<el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">签约材料</el-button>
</el-upload>
<template v-if="addMsg.SigningType && saveMsg&& saveMsg.length>0">
<template v-for="(subItem,subIndex) in saveMsg">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.Path,subItem.FileName)">{{subItem.FileName}}</a>
<a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
@click="DeleteFile(subIndex)">删除</a>
</template>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerSource')" prop="CustomerSourceType">
<el-select filterable v-model='addMsg.CustomerSourceType' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in khly' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.Belongbrand')" prop="brandIds">
<el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds'
:placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in CustomerBrandList' :label='item.name' :value='item.id' :key='item.id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('visaT.post')" prop="Duty">
<el-select filterable v-model='addMsg.Duty' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in zw' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.premises')" prop="Premises">
<el-select filterable v-model='addMsg.Premises' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in jycs' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签约月结客户" prop="SigningType">
<el-checkbox v-model='addMsg.SigningType'>
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签约资料" prop="SigningFile">
<el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">签约材料</el-button>
</el-upload>
<template v-if="addMsg.SigningType && saveMsg&& saveMsg.length>0">
<template v-for="(subItem,subIndex) in saveMsg">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
@click="downloadFile(subItem.Path,subItem.FileName)">{{subItem.FileName}}</a>
<a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
@click="DeleteFile(subIndex)">删除</a>
</template>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="18">
<el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
<el-input v-model="addMsg.remark" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerInfo')" prop="remark" v-show='addMsg.CustomerSourceType==6'>
<el-input v-model="addMsg.CustomerSource" maxlength="20"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.BusinessPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.doorPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg1"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="HousePhotos" :src="HousePhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.businessPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg2"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="Images" :src="Images" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>
</el-row>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="18">
<el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
<el-input v-model="addMsg.remark" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerInfo')" prop="remark" v-show='addMsg.CustomerSourceType==6'>
<el-input v-model="addMsg.CustomerSource" maxlength="20"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.BusinessPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.doorPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg1"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="HousePhotos" :src="HousePhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.businessPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg2"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="Images" :src="Images" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>
</el-row>
</template>
</el-form>
</div>
<!-- 编辑客户信息 -->
......@@ -721,8 +722,7 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="联系电话">
<el-input class='w200' v-model="updateMsg.contactNumber" @input='searchHistory(updateMsg.contactNumber)'
placeholder="请输入联系电话"></el-input>
<el-input class='w200' v-model="updateMsg.contactNumber" @input='searchHistory(updateMsg.contactNumber)' placeholder="请输入联系电话"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -1068,11 +1068,11 @@
// this.$message.error('请输入联系电话')
// return
// }
if (!this.updateMsg.CustomerName) {
if(!this.updateMsg.CustomerName){
this.$message.error('请输入客户名称')
return
}
if (!this.updateMsg.Contact) {
if(!this.updateMsg.Contact){
this.$message.error('请输入联系人')
return
}
......@@ -1133,7 +1133,7 @@
})
let AreaName = sheng + shi + qu
this.updateMsg.Address = AreaName + ',' + this.updateMsg.Address
if (!this.updateMsg.Address) {
if(!this.updateMsg.Address){
this.$message.error('请输入输入详情地址')
return
}
......@@ -1499,28 +1499,30 @@
}
}, err => {})
},
saveVisa() { //
this.addMsg.SigningType = this.addMsg.SigningType ? 1 : 0
console.log('save', this.addMsg, this.updateMsg)
if (!this.addMsg.contactNumber) {
saveVisa() { //
this.addMsg.SigningType = this.addMsg.SigningType ? 1 : 0
console.log('save', this.addMsg, this.updateMsg)
if(!this.addMsg.contactNumber){
this.$message.error('请输入联系电话')
return
}
if (!this.addMsg.customerName) {
if(!this.addMsg.customerName){
this.$message.error('请输入客户名称')
return
}
if (!this.addMsg.contact) {
if(!this.addMsg.contact){
this.$message.error('请输入联系人')
return
}
if (this.addMsg.SigningType && !this.saveMsg.length) {
if(this.addMsg.SigningType && !this.saveMsg.length){
this.$message.error('请上传签约材料')
return
} else {
if (this.saveMsg && this.saveMsg.length > 0) {
this.addMsg.SigningFile = this.saveMsg[0].Path;
if(this.saveMsg&&this.saveMsg.length>0)
{
this.addMsg.SigningFile = this.saveMsg[0].Path
}
}
// if(!this.addMsg.UniqueCode){
// this.$message.error('请输入统一编码')
......@@ -1530,9 +1532,9 @@
// this.$message.error('请输入LINE ID')
// return
// }
if (this.updateMsg.Email) {
var reg = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
if (!reg.test(this.updateMsg.Email)) {
if(this.updateMsg.Email){
var reg=/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
if(!reg.test(this.updateMsg.Email)){
this.$message.error('请输入有效的邮箱')
return
}
......@@ -1579,7 +1581,7 @@
})
let AreaName = sheng + shi + qu
this.addMsg.address = AreaName + ',' + this.addMsg.address
if (!this.addMsg.address) {
if(!this.addMsg.address){
this.$message.error('请输入输入详情地址')
return
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ ea6c25c8
......@@ -1701,7 +1701,7 @@
</p>
<p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red">
<p v-if="item.commissionMoney" style="color: red;cursor: pointer;">
<span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
<commissionDialog :type="pagesTitle" :objNew="item"></commissionDialog>{{item.commissionCurrency}}
<!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
......@@ -4117,7 +4117,7 @@
}
});
},
cancelSubmit() {
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ ea6c25c8
......@@ -829,11 +829,11 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
<tr v-if="(isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4
|| isExists(item.CostTypeList,'机票退税')
|| isExists(item.CostTypeList,'机票罚金')
|| isExists(item.CostTypeList,'机票税金'))
<tr v-if="(isExists(item.CostTypeList,'国际段机票')
|| item.OrderSource===4
|| isExists(item.CostTypeList,'机票退税')
|| isExists(item.CostTypeList,'机票罚金')
|| isExists(item.CostTypeList,'机票税金'))
|| isExists(item.CostTypeList,'国内联运段机票')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
......@@ -1102,7 +1102,8 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<tr
v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险') || isExists(item.CostTypeList,'团队保险')">
v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险')
|| isExists(item.CostTypeList,'团队保险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1211,24 +1212,24 @@
<tr v-if="NotExists(item.CostTypeList,'领队奖励金')
&&NotExists(item.CostTypeList,'机票折让费')
&&NotExists(item.CostTypeList,'签证费')
&&NotExists(item.CostTypeList,'签证佣金')
&& NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'提成')
&&NotExists(item.CostTypeList,'签证佣金')
&& NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'提成')
&& NotExists(item.CostTypeList,'国内联运')
&& NotExists(item.CostTypeList,'车资')
&& NotExists(item.CostTypeList,'邀请函费用')
&& NotExists(item.CostTypeList,'名单表费')
&& NotExists(item.CostTypeList,'领队佣金')
&& NotExists(item.CostTypeList,'导游佣金')
&&item.OrderSource!==4
&& NotExists(item.CostTypeList,'国际段机票')
&& NotExists(item.CostTypeList,'机票退税')
&& NotExists(item.CostTypeList,'机票罚金')
&& NotExists(item.CostTypeList,'机票税金')
&& item.OrderSource!==11
&& NotExists(item.CostTypeList,'赔偿')
&& NotExists(item.CostTypeList,'保险费')
&& NotExists(item.CostTypeList,'车资')
&& NotExists(item.CostTypeList,'邀请函费用')
&& NotExists(item.CostTypeList,'名单表费')
&& NotExists(item.CostTypeList,'领队佣金')
&& NotExists(item.CostTypeList,'导游佣金')
&&item.OrderSource!==4
&& NotExists(item.CostTypeList,'国际段机票')
&& NotExists(item.CostTypeList,'机票退税')
&& NotExists(item.CostTypeList,'机票罚金')
&& NotExists(item.CostTypeList,'机票税金')
&& item.OrderSource!==11
&& NotExists(item.CostTypeList,'赔偿')
&& NotExists(item.CostTypeList,'保险费')
&& NotExists(item.CostTypeList,'旅游责任险')
&& NotExists(item.CostTypeList,'团队保险')">
<td>
......@@ -2026,7 +2027,8 @@
},
zhaunBox: function () {
let flag = false
this.DataList.FinicePayList.forEach(x => {
// FinicePayList 未排除重复数据
this.DataList.newFinicePayList2.forEach(x => {
if (x.checked) {
flag = true
this.zhuanMsg.FrIds += x.FrID + ','
......@@ -2130,7 +2132,12 @@
data.FiniceReciveList.forEach(x => {
x.checked = false;
})
let objData2 = function (obj) {
obj.forEach(x=>{
x.checked = false
})
}
objData2(data.newFinicePayList2)
this.DataList = data;
data.FinicePayList.forEach(item => {
if ((that.isExists(item.CostTypeList, '国际段机票') ||
......@@ -2256,7 +2263,7 @@
this.moneyAll.peichangsf += item.PayMoney;
}
// 保险费
if (that.isExists(item.CostTypeList, '保险费') || that.isExists(item.CostTypeList, '旅游责任险')) {
if (that.isExists(item.CostTypeList, '保险费') || that.isExists(item.CostTypeList, '旅游责任险') || that.isExists(item.CostTypeList, '团队保险')) {
this.moneyAll.baoxianyf += item.Money;
this.moneyAll.baoxiansf += item.PayMoney;
}
......@@ -2276,7 +2283,7 @@
.CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
.CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') &&
that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票折让费')) {
that.NotExists(item.CostTypeList, '旅游责任险')&& that.NotExists(item.CostTypeList, '团队保险') && that.NotExists(item.CostTypeList, '机票折让费')) {
this.moneyAll.otheryf += item.Money;
this.moneyAll.othersf += item.PayMoney;
}
......@@ -2294,18 +2301,18 @@
})
// if(this.moneyAll.dijieys>0 || this.moneyAll.dijiess>0){
// }
// }
// if(this.moneyAll.zifeiys>0 || this.moneyAll.zifeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.zifeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.zifeiss;
// }
// }
// if(this.moneyAll.xiaofeiys>0 || this.moneyAll.xiaofeiss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.xiaofeiys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.xiaofeiss;
// } if(this.moneyAll.yongjinys>0 || this.moneyAll.yongjinss>0){
// this.moneyAll.otheryTotalyf+=this.moneyAll.yongjinys;
// this.moneyAll.otheryTotalsf+=this.moneyAll.yongjinss;
// }
// }
}
});
},
......
src/components/sale/ExpectedCommission.vue
View file @ ea6c25c8
......@@ -46,6 +46,11 @@
.CommissionLadder p {
padding: 5px 0 0px 0;
font-size: 15px;
display: flex;
justify-content: space-between;
}
.CommissionLadder p span:last-child{
color: red;
}
.CommissionInfor{
padding: 0 0 10px 0;
......@@ -214,7 +219,7 @@
</div>
<div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 10px 0;">
<p>当月人头奖励(不含门票、包车、国内游)</p>
<p><span>当月人头奖励(不含门票、包车、国内游)</span><span>单团(独立成团)</span></p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.PeopleNum}}</span>
......@@ -228,7 +233,7 @@
</div>
</div>
<div class="CommissionLadder Line">
<p>当月人头奖励(不含门票、包车、国内游)</p>
<p><span>当月人头奖励(不含门票、包车、国内游)</span><span>单团(独立成团)</span></p>
<div class="CommissionInfor">
<span>
人头数量：<span>{{CommissionInfor.EuropePNum}}</span>
......
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