Skip to content

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

no message

parent 222a1019
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 40 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 50322045
...@@ -442,9 +442,10 @@ ...@@ -442,9 +442,10 @@
台湾提成详情</span> 台湾提成详情</span>
--> -->
<!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 --> <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
<span v-if="GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57 <span v-if="(GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66 && GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=75" && GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=75)||
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
...@@ -2093,7 +2094,8 @@ export default { ...@@ -2093,7 +2094,8 @@ export default {
path = GetDetail.OtherType == 73?'OpComPersonDetails':'OPCommissionDetail' path = GetDetail.OtherType == 73?'OpComPersonDetails':'OPCommissionDetail'
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id) obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
obj.OutBranchId = null obj.OutBranchId = null
}else { }else if((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64){
this.$router.push({ this.$router.push({
name: 'CommissionDetail', name: 'CommissionDetail',
query: { query: {
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 50322045
...@@ -863,9 +863,10 @@ ...@@ -863,9 +863,10 @@
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
--> -->
<!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 --> <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
<span v-if="GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57 <span v-if="(GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66 && GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=75" && GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=75)||
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
...@@ -1868,7 +1869,8 @@ ...@@ -1868,7 +1869,8 @@
path = GetDetail.OtherType == 73?'OpComPersonDetails':'OPCommissionDetail' path = GetDetail.OtherType == 73?'OpComPersonDetails':'OPCommissionDetail'
obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id) obj.RB_Branch_Id = String(GetDetail.RB_Branch_Id)
obj.OutBranchId = null obj.OutBranchId = null
}else { }else if((GetDetail.TemplateId==28 || GetDetail.TemplateId==30)
&& GetDetail.OtherType!=63 && GetDetail.OtherType!=64){
this.$router.push({ this.$router.push({
name: 'CommissionDetail', name: 'CommissionDetail',
query: { query: {
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ 50322045
...@@ -175,6 +175,31 @@ ...@@ -175,6 +175,31 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="金额：">
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="发团日期：">
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<template v-if="heightQueryBox"> <template v-if="heightQueryBox">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="费用类型："> <el-form-item label="费用类型：">
...@@ -184,6 +209,7 @@ ...@@ -184,6 +209,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--
<el-col :span="4"> <el-col :span="4">
<el-form-item label="账户类型："> <el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType' > <el-select filterable v-model='msg.AccountType' >
...@@ -219,7 +245,7 @@ ...@@ -219,7 +245,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item label="排序："> <el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' > <el-select filterable v-model='msg.Sort' >
...@@ -256,6 +282,7 @@ ...@@ -256,6 +282,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--
<el-col :span="4"> <el-col :span="4">
<el-form-item label="币种类型：" > <el-form-item label="币种类型：" >
<el-select filterable v-model='msg.CurrencyId' > <el-select filterable v-model='msg.CurrencyId' >
...@@ -263,27 +290,14 @@ ...@@ -263,27 +290,14 @@
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option> <el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item label="订单编号："> <el-form-item label="订单编号：">
<el-input v-model="msg.OrderID"></el-input> <el-input v-model="msg.OrderID"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="金额："> <!--
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="交易日期："> <el-form-item label="交易日期：">
<el-date-picker class="h34" <el-date-picker class="h34"
...@@ -293,17 +307,8 @@ ...@@ -293,17 +307,8 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="6">
<el-form-item label="发团日期：">
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="备注查询："> <el-form-item label="备注查询：">
<el-input v-model="msg.Remark"></el-input> <el-input v-model="msg.Remark"></el-input>
...@@ -339,6 +344,23 @@ ...@@ -339,6 +344,23 @@
</li> </li>
</ul> </ul>
</div> </div>
<div style="display: flex;flex-wrap: nowrap; padding: 0 10px;">
<div style="display: flex;flex-wrap: wrap;">
<span>已选数据：</span>
<template v-if="multipleSelection.length>0">
<el-tag size="mini" closable
style="margin-right: 5px;"
v-for="(x,index) in multipleSelection"
:key="x.FrID" @close="handleClose([multipleSelection[index]])">{{x.FrID}}</el-tag>
</template>
<template v-else>
无
</template>
</div>
<div style="margin-left: 20px;">
总金额：{{getMoney()}}
</div>
</div>
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
...@@ -359,7 +381,8 @@ ...@@ -359,7 +381,8 @@
label="单号" label="单号"
width="120"> width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row)">{{ scope.row.FrID }}</span> <span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -525,7 +548,9 @@ ...@@ -525,7 +548,9 @@
label="关联月结付款单" label="关联月结付款单"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.ReFinanceId?scope.row.ReFinanceId:'-'}} <span v-if="scope.row.ReFinanceId" style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.ReFinanceId)">{{ scope.row.ReFinanceId }}</span>
<template v-else>-</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -739,10 +764,18 @@ export default { ...@@ -739,10 +764,18 @@ export default {
var that = this; var that = this;
}, },
methods:{ methods:{
handleClose(rows){
if (rows) {
rows.forEach(row => {
this.$refs.multipleTable.toggleRowSelection(row);
});
}
// this.multipleSelection.splice(index,1)
},
// 单据详情 // 单据详情
openDetails(item) { openDetails(FrID) {
let query = { let query = {
id: item.FrID, id: FrID,
blank: "y", blank: "y",
}; };
this.$router.push({ this.$router.push({
...@@ -1152,6 +1185,13 @@ export default { ...@@ -1152,6 +1185,13 @@ export default {
this.msg.pageIndex=1; this.msg.pageIndex=1;
this.currentPage = 1; this.currentPage = 1;
}, },
getMoney(){
let Money = 0
this.multipleSelection.forEach(x=>{
Money += Number(x.Money*100)
})
return Money/100
},
GenerateDocuments(){ GenerateDocuments(){
if(this.multipleSelection.length==0){ if(this.multipleSelection.length==0){
this.Error('请选择需要制单的数据'); this.Error('请选择需要制单的数据');
...@@ -1174,7 +1214,7 @@ export default { ...@@ -1174,7 +1214,7 @@ export default {
ReFinanceIds: ids.join(','),//单号 ReFinanceIds: ids.join(','),//单号
ReFinanceId2: 3,//成本 ReFinanceId2: 3,//成本
} }
this.$confirm(`总金额：${orderObj.Money},是否继续生成财务单据`, "提示", { this.$confirm(`已选单号：${ids.join(',')}，总金额：${orderObj.Money},是否继续生成财务单据`, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
......
src/components/FinancialModule/domestic/OPsalesCommissionUser.vue
View file @ 50322045
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
} }
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0 this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
console.log(this.msg.PeriodId,'====')
this.getList(); this.getList();
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
...@@ -215,7 +216,7 @@ ...@@ -215,7 +216,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data; this.PeriodsList = res.data.data;
if (this.PeriodsList && this.PeriodsList.length > 0) { if (!this.$route.query.PeriodId&&this.PeriodsList && this.PeriodsList.length > 0) {
this.msg.PeriodId = Number(this.PeriodsList[0].Id) this.msg.PeriodId = Number(this.PeriodsList[0].Id)
} }
......
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