Skip to content

S
SuperMan
Commit 3ef3d86b authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents a1d5db72 f6dc450c
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 120 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 3ef3d86b
...@@ -124,9 +124,9 @@ ...@@ -124,9 +124,9 @@
font-size: 12px; font-size: 12px;
} }
.page_bdm ._fujian_box{ .page_bdm ._fujian_box{
position: fixed; position: absolute;
left: 961px; left: 895px;
top: 148px; top: 0px;
width: 440px; width: 440px;
} }
.page_bdm ._wenjian{ .page_bdm ._wenjian{
......
src/components/FinancialModule/HandDispensingFee/list.vue
View file @ 3ef3d86b
...@@ -304,6 +304,7 @@ ...@@ -304,6 +304,7 @@
this.getTemplateCostTypeList() this.getTemplateCostTypeList()
}, },
methods: { methods: {
// 获取所有费用类型
getTemplateCostTypeList(){ getTemplateCostTypeList(){
this.apipost('financeinfo_post_GetCostTypeList',{Type:2},res=>{ this.apipost('financeinfo_post_GetCostTypeList',{Type:2},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
...@@ -312,10 +313,11 @@ ...@@ -312,10 +313,11 @@
} }
},err=>{}) },err=>{})
}, },
// 所有审核流程
FinancialFlowTemplate_post_GetList() { FinancialFlowTemplate_post_GetList() {
// 单据类型
this.apipost( this.apipost(
"Financial_post_GetList", "FinancialFlowTemplate_post_GetSingleList",//Financial_post_GetList
{}, {},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -326,10 +328,8 @@ ...@@ -326,10 +328,8 @@
err => {} err => {}
); );
}, },
//获取详情 //获取历史详情
getDetails(index,type) { getDetails(index,type) {
// console.log(this.DataList[index].HistoryClientList)
// return
this.Details = type==1?this.DataList[index].HistoryClientList:this.DataList[index].DetailList; this.Details = type==1?this.DataList[index].HistoryClientList:this.DataList[index].DetailList;
}, },
//获取当前下拉选中币种 //获取当前下拉选中币种
......
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @ 3ef3d86b
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</style> </style>
<template > <template >
<div class="page_fnDm page_RecPayQuery" @keyup.enter="getPageList()"> <div class="page_RecPayQuery" @keyup.enter="getPageList()">
<div class="query-box"> <div class="query-box">
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;"> <el-row style="padding:15px 20px 0 0;">
...@@ -248,6 +248,9 @@ ...@@ -248,6 +248,9 @@
prop="FinanceId" prop="FinanceId"
label="单号" label="单号"
width="80"> width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row)">{{ scope.row.FinanceId }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="CostTypeName" prop="CostTypeName"
...@@ -324,7 +327,12 @@ ...@@ -324,7 +327,12 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="HandFeeFrId" prop="HandFeeFrId"
label="关联代付单" width="120"></el-table-column> label="关联代付单" width="120">
<template slot-scope="scope">
<template v-if="scope.row.HandFeeFrId">{{scope.row.HandFeeFrId}}</template>
<p v-else style="cursor: pointer;color: #00C6FF;" @click="isshezhiBox=true,shezhiMsg.FinanceId=scope.row.FinanceId">设置关联</p>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="" prop=""
label="关联手配费收入单" label="关联手配费收入单"
...@@ -340,7 +348,7 @@ ...@@ -340,7 +348,7 @@
<el-dialog custom-class='w400' title="手配费制单" :visible.sync="iszhidanBox" center> <el-dialog custom-class='w400' title="手配费制单" :visible.sync="iszhidanBox" center>
<template> <template>
<div style="color: black;font-size: 17px;padding: 0 0 10px 10px;border-bottom: 1px solid #EBEEF5;"> <div style="color: black;font-size: 17px;padding: 0 0 10px 10px;border-bottom: 1px solid #EBEEF5;">
<p>已选中{{multipleSelection.length}}调数据</p> <p>已选中{{multipleSelection.length}}条数据</p>
<p style="margin-top: 15px;">原币总金额： <p style="margin-top: 15px;">原币总金额：
{{totalZD.toFixed(2)}} {{totalZD.toFixed(2)}}
</p> </p>
...@@ -351,6 +359,19 @@ ...@@ -351,6 +359,19 @@
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog custom-class='w400' title="设置手配费关联" :visible.sync="isshezhiBox" center>
<template>
<el-form label-width="120px" :model="shezhiMsg" :rules="rules" ref="shezhiMsg">
<el-form-item label="关联手配费单号" prop="HandFeeFrId">
<el-input v-model="shezhiMsg.HandFeeFrId" placeholder="请输入关联手配费单号"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="isshezhiBox=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="setHandFeeFr()">{{$t('pub.sureBtn')}}</button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -361,6 +382,11 @@ import Vue from 'vue' ...@@ -361,6 +382,11 @@ import Vue from 'vue'
export default { export default {
data(){ data(){
return{ return{
shezhiMsg:{
FinanceId:0,
HandFeeFrId:null
},
isshezhiBox: false,
GetHandFeeList:[], GetHandFeeList:[],
multipleSelection: [], multipleSelection: [],
showID:false, showID:false,
...@@ -449,6 +475,13 @@ export default { ...@@ -449,6 +475,13 @@ export default {
StandardCurrencyName: "", StandardCurrencyName: "",
Money: 0 Money: 0
}, },
rules:{
HandFeeFrId: [{
required: true,
message: '请输入关联手配费单号',
trigger: 'blur'
}],
}
} }
},created(){ },created(){
if(this.$route.query.FrID){ if(this.$route.query.FrID){
...@@ -457,7 +490,7 @@ export default { ...@@ -457,7 +490,7 @@ export default {
if(this.$route.query.HandFeeFrId){ if(this.$route.query.HandFeeFrId){
this.msg.HandFeeFrId = this.$route.query.HandFeeFrId this.msg.HandFeeFrId = this.$route.query.HandFeeFrId
}else{ }else{
let sDate= this.FormartDate(new Date(this.getBeforeDate(31))); let sDate= this.FormartDate(new Date(this.getBeforeDate(1)));
let eDate= this.FormartDate(new Date(this.getBeforeDate(0))); let eDate= this.FormartDate(new Date(this.getBeforeDate(0)));
this.productionDate = [sDate,eDate] this.productionDate = [sDate,eDate]
this.msg.sDate= sDate; this.msg.sDate= sDate;
...@@ -477,22 +510,41 @@ export default { ...@@ -477,22 +510,41 @@ export default {
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.DepartIDs = userInfo.RB_Department_Id; this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.financeinfo_post_GetCostTypeList(); this.financeinfo_post_GetCostTypeList();
this.getCompanyList();//获取公司列表 this.getCompanyList();//获取公司列表
this.FinancialFlowTemplate_post_GetStatusList(); this.FinancialFlowTemplate_post_GetStatusList();
this.getFKList()//付款对象 this.getFKList()//付款对象
this.GetHandFee()//手配费公司 this.GetHandFee()//手配费公司
}, },
methods:{ methods:{
// 单据详情
openDetails(item) {
let query = {
id: item.FinanceId,
blank: "y",
};
this.$router.push({
path: "/FinancialDocumentsDetail",
query
});
},
// 设置手配费关联
setHandFeeFr(){
this.$refs['shezhiMsg'].validate((valid) => {
if (valid) {
this.apipost('Financial_post_SetFinanceHandFeeRelevance',this.shezhiMsg,res=>{
if(res.data.resultCode==1){
this.isshezhiBox = false
this.getPageList()
}else{
this.Error(res.data.message);
}
},err=>{})
} else {
return false;
}
});
},
DocumentMaking(){ DocumentMaking(){
let ids = this.multipleSelection.map(x=>{ return x.FinanceId}) let ids = this.multipleSelection.map(x=>{ return x.FinanceId})
if(ids.length==0){ if(ids.length==0){
......
src/components/FinancialModule/addFinancialDocumentsSPF.vue
View file @ 3ef3d86b
...@@ -491,13 +491,11 @@ ...@@ -491,13 +491,11 @@
</div> </div>
<!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> --> <!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> -->
</template> </template>
<template v-if="isHandFee">
<el-tooltip content="配置手配费" placement="top"></el-tooltip> <el-tooltip content="配置手配费" placement="top"></el-tooltip>
<el-switch <el-switch v-if="isHandFee"
v-model="is_HandFee" @change="getHandFee"> v-model="is_HandFee" @change="getHandFee">
</el-switch> </el-switch>
</el-tooltip> </el-tooltip>
</template>
</div> </div>
<template v-if="isHandFee&&is_HandFee"> <template v-if="isHandFee&&is_HandFee">
<div> <div>
...@@ -1605,6 +1603,18 @@ export default { ...@@ -1605,6 +1603,18 @@ export default {
this.apipost('Financial_post_Get', {ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => { this.apipost('Financial_post_Get', {ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data= res.data.data; let data= res.data.data;
// if((data.TemplateId==245
// ||data.TemplateId==246
// ||data.TemplateId==247
// ||data.TemplateId==248)&&!this.isHandFee&&data.KingdeeBranchId&&this.msg.RB_Branch_Id!=1220){
// this.GetHandFeeList()//获取手配费功能权限配置
// this.is_HandFee = true
// this.isHandFee = true
// this.HandFee.BranchId = data.KingdeeBranchId
// }else{
// this.is_HandFee = false
// this.isHandFee = false
// }
this.editTemplateId=data.TemplateId; this.editTemplateId=data.TemplateId;
this.getCompany(); this.getCompany();
...@@ -1751,6 +1761,21 @@ export default { ...@@ -1751,6 +1761,21 @@ export default {
}, err => {}) }, err => {})
}, },
admin_get_DepartmentGetList(Bid, T){ admin_get_DepartmentGetList(Bid, T){
if(this.msg.RB_Branch_Id==1220){
this.is_HandFee = false
this.isHandFee = false
}else{
if(this.$route.query.id==245
||this.$route.query.id==246
||this.$route.query.id==247
||this.$route.query.id==248){
this.is_HandFee = true
this.isHandFee = true
}else{
this.is_HandFee=false
this.isHandFee = false
}
}
if(Bid>=0){ if(Bid>=0){
let isShow = true let isShow = true
this.companyList.forEach(item=>{ this.companyList.forEach(item=>{
...@@ -2004,6 +2029,8 @@ export default { ...@@ -2004,6 +2029,8 @@ export default {
||this.$route.query.id==248){ ||this.$route.query.id==248){
this.GetHandFeeList()//获取手配费功能权限配置 this.GetHandFeeList()//获取手配费功能权限配置
this.isHandFee = true this.isHandFee = true
}else{
this.is_HandFee = false
} }
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.department = userInfo.DepartName; this.department = userInfo.DepartName;
......
src/components/Hotel/reservation/OrderList.vue
View file @ 3ef3d86b
...@@ -346,18 +346,12 @@ ...@@ -346,18 +346,12 @@
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span> <span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span>
<span>销售：</span> <span class="mr">销售：{{ item.SaleName }}</span>
<span class="mr"> <span class="mr" v-if="item.OpName&&pagesTitle=='OP'">关联OP：{{ item.OpName }}</span>
{{ item.SaleName }} <span class="mr" v-if="item.CustomerName">创建人：{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
</span>
<span class="mr" v-if="item.CustomerName">创建人：</span>
<span class="mr" v-if="item.CustomerName"
>{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
item.CustomerTel item.CustomerTel
}})</span }}</span>
> <span class="mr">下单时间：{{ item.CreateTime }}</span>
<span>下单时间：</span>
<span class="mr">{{ item.CreateTime }}</span>
<div class=""> <div class="">
<i <i
class="mx5" class="mx5"
...@@ -612,7 +606,7 @@ ...@@ -612,7 +606,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -640,7 +634,7 @@ ...@@ -640,7 +634,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -667,7 +661,7 @@ ...@@ -667,7 +661,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <!--<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -698,7 +692,7 @@ ...@@ -698,7 +692,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div>--> </div>-->
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
<div class="row-c justify-sb borderD pb5"> <div class="row-c justify-sb borderD pb5">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/Hotel/singleProduct/HotelOrderOP.vue
View file @ 3ef3d86b
...@@ -45,64 +45,6 @@ ...@@ -45,64 +45,6 @@
methods: { methods: {
//获取酒店订单列表
GetList() {
// if(this.msg.StartTime==''){
// this.msg.StartTime = this.getyMDOne()
// }
// if(this.msg.EndTime==''){
// this.msg.EndTime = this.getyMDTwo()
// }
this.loading = true
this.apipost(
"dict_post_GetMySaleCustomerOrderPageList", this.msg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
let addList = function(arr){
arr.forEach(x=>{
x.list = []
// x.Tax = 0
// x.Tax2 = 0
})
}
addList(data)
data.forEach(item => {
item.DetailList.forEach(x=>{
x.Number = 0
x.PeopleNumber = 0
x.RoomList.forEach(r=>{
x.Number+=r.Number
x.PeopleNumber+=r.PeopleNumber
})
x.Tax = x.TaxesPrice*x.Number
x.Tax2 = x.PriceInTangTax*x.PeopleNumber
x.Money = x.HotelMoeny+x.TaxesPrice
})
})
this.OrderList = data;
this.OrderList.forEach(item=>{
let datas = {
Income: item.Income,
CostMoney: item.CostMoney,
PlatformTax: item.PlatformTax,
Refund: item.Refund,
HandFittingIncome: item.HandFittingIncome,
HandFittingTax: item.HandFittingTax
}
item.list.push(datas)
})
this.total = res.data.data.count;
}else {
this.Error(res.data.message);
}
},
err => {this.loading = false}
);
},
}, },
mounted() { mounted() {
......
src/components/Hotel/singleProduct/components/OrderList.vue
View file @ 3ef3d86b
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
...@@ -614,7 +614,7 @@ ...@@ -614,7 +614,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
...@@ -639,7 +639,7 @@ ...@@ -639,7 +639,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
...@@ -668,7 +668,7 @@ ...@@ -668,7 +668,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
<div class="row-c justify-sb borderD pb5"> <div class="row-c justify-sb borderD pb5">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ 3ef3d86b
...@@ -759,7 +759,7 @@ ...@@ -759,7 +759,7 @@
</el-tooltip> </el-tooltip>
</div> --> </div> -->
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 3ef3d86b
...@@ -428,10 +428,8 @@ ...@@ -428,10 +428,8 @@
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span> <span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span>
<span>销售：</span> <span class="mr">销售：{{ item.SaleName }}</span>
<span class="mr"> <span class="mr" v-if="item.OpName&&pagesTitle=='OP'">关联OP：{{ item.OpName }}</span>
{{ item.SaleName }}
</span>
<span class="mr" v-if="item.CustomerName">创建人：</span> <span class="mr" v-if="item.CustomerName">创建人：</span>
<span class="mr" v-if="item.CustomerName" <span class="mr" v-if="item.CustomerName"
>{{ item.CustomerName }} ({{ item.CustomerContact }}/{{ >{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
...@@ -663,7 +661,7 @@ ...@@ -663,7 +661,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ 3ef3d86b
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ 3ef3d86b
...@@ -527,15 +527,12 @@ ...@@ -527,15 +527,12 @@
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span> <span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span>
<span>销售：</span> <span class="mr">销售：{{ item.SaleName }}</span>
<span class="mr"> <span class="mr" v-if="item.OpName&&pagesTitle=='OP'">关联OP：{{ item.OpName }}</span>
{{ item.SaleName }}
</span>
<span class="mr" v-if="item.CustomerName">创建人：{{ item.CustomerName }} ({{ item.CustomerContact }}<template v-if="item.CustomerTel">/{{ <span class="mr" v-if="item.CustomerName">创建人：{{ item.CustomerName }} ({{ item.CustomerContact }}<template v-if="item.CustomerTel">/{{
item.CustomerTel item.CustomerTel
}}</template>)</span> }}</template>)</span>
<span>下单时间：</span> <span class="mr">下单时间：{{ item.CreateTime }}</span>
<span class="mr">{{ item.CreateTime }}</span>
<div class=""> <div class="">
<i class="mx5" :class="{ <i class="mx5" :class="{
'el-icon-alarm-clock c20C997': item.OrderStatus == 1, 'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
...@@ -687,7 +684,7 @@ ...@@ -687,7 +684,7 @@
</template> </template>
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
...@@ -703,7 +700,7 @@ ...@@ -703,7 +700,7 @@
@click="makeAdocument(item, index, 1)"></i> @click="makeAdocument(item, index, 1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
...@@ -719,7 +716,7 @@ ...@@ -719,7 +716,7 @@
@click="makeAdocument(item, index, 2)"></i> @click="makeAdocument(item, index, 2)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:300px"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
...@@ -743,7 +740,7 @@ ...@@ -743,7 +740,7 @@
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/router/config.js
View file @ 3ef3d86b
...@@ -4005,7 +4005,7 @@ export default { ...@@ -4005,7 +4005,7 @@ export default {
{ //财务 财务单据 我的财务单据详情 { //财务 财务单据 我的财务单据详情
path: '/FinancialDocumentsDetail', path: '/FinancialDocumentsDetail',
name: 'FinancialDocumentsDetail', name: 'FinancialDocumentsDetail',
component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetail'], resolve), component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetailSPF'], resolve),
meta: { meta: {
title: '单据详情' title: '单据详情'
}, },
...@@ -4110,7 +4110,7 @@ export default { ...@@ -4110,7 +4110,7 @@ export default {
}, { //财务 财务单据 新增财务单据 页面 }, { //财务 财务单据 新增财务单据 页面
path: '/addFinancialDocuments', path: '/addFinancialDocuments',
name: 'addFinancialDocuments', name: 'addFinancialDocuments',
component: resolve => require(['@/components/FinancialModule/addFinancialDocuments'], resolve), component: resolve => require(['@/components/FinancialModule/addFinancialDocumentsSPF'], resolve),
meta: { meta: {
title: '新增付款单据' title: '新增付款单据'
}, },
......
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