Commit 2d48459d authored by 罗超's avatar 罗超

1

parent 4119b68b
......@@ -164,6 +164,12 @@
<span v-if="props.row.IsApplyForCancel===1"></span>
<span v-if="props.row.IsApplyForCancel===2"></span>
</q-td>
</template>
<template v-slot:body-cell-ApplyForCancelStatus="props">
<q-td :props="props">
<span v-if="props.row.ApplyForCancelStatus===1">同意</span>
<span v-if="props.row.ApplyForCancelStatus===2">拒绝</span>
</q-td>
</template>
<!-- <template v-slot:body-cell-optioned="props">
<q-td :props="props">
......@@ -256,15 +262,19 @@
label: "是否申请取消",
field:" IsApplyForCancel",
align: "left"
},
{
name: " ApplyForCancelStatus",
label: "申请取消审核状态",
field:" ApplyForCancelStatus",
align: "left"
},
{
name: "Remark",
label: "备注",
field:"Remark",
align: "left"
},
},
// {
// name: 'optioned',
// label: '操作',
......
......@@ -204,21 +204,22 @@
<q-item-label>报名列表</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/activeSummary',props.row)">
<q-item clickable v-close-popup @click="goUrl('/activity/payment',props.row)">
<q-item-section>
<q-item-label>活动总结</q-item-label>
<q-item-label>活动收支</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="goUrl('/activity/materialMan',props.row)">
<q-item clickable v-close-popup @click="goUrl('/activity/activeSummary',props.row)" v-if="props.row.ActivityStatus!==2">
<q-item-section>
<q-item-label>活动图片与视频</q-item-label>
<q-item-label>活动总结</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup>
<q-item clickable v-close-popup @click="goUrl('/activity/materialMan',props.row)" v-if="props.row.ActivityStatus!==2">
<q-item-section>
<q-item-label>活动收支</q-item-label>
<q-item-label>活动图片与视频</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
......
<template>
<div class="ChooseImg materialMan page-body">
<q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
<div v-loading="loading" style="margin-top:10px;background:#fff;padding:20px">
<div class="TabDiv">
<span :class="commonType==1?'spanActive':''" @click="handleClick(1)">图片</span>
......@@ -9,7 +10,7 @@
<div>
<div style="height: 718px;display:flex;" flex="box:first" >
<div style="margin-right: 15px;width: auto;-webkit-box-flex: 0;flex-shrink: 0;flex-grow: 0;">
<el-button @click="addGroup" style="margin-bottom: 12px;" type="primary" size="small">添加分组</el-button>
<q-btn @click="addGroup" style="margin-bottom: 12px;" color="accent" size="sm">添加分组</q-btn>
<div style="border: 1px solid rgb(227, 227, 227);width:250px">
<div class="el-scrollbar" style="width: 100%;height:670px;">
<div class="el-scrollbar__wrap" style="margin-bottom: -8px; margin-right: -8px;">
......@@ -296,6 +297,9 @@
},
methods: {
goBack(){
this.$router.go(-1)
},
//登录后获取上传配置
getUpConfig(){
......
This diff is collapsed.
......@@ -104,6 +104,7 @@
platformAccount:'',
Handmsg:{},
czmsg:{},
ReFinanceId:0,//活动id
}
},
computed: {
......@@ -142,7 +143,7 @@
this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments',
query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单',GuestId:this.$route.query.GuestId}
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单',GuestId:this.$route.query.GuestId,ReFinanceId:this.ReFinanceId}
});
}
}else if(this.active==2){
......@@ -310,7 +311,9 @@
else if(this.showTab==4){
this.GetList = this.ZRList;
}
if(this.$route.query.ReFinanceId){
this.ReFinanceId=this.$route.query.ReFinanceId
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
......
......@@ -720,7 +720,7 @@
RB_BranchName:'',
RB_DepartName:'',
OrderSource : 17,
GuestId:""
GuestId:"",
},
AccountNumber: '',
queryAccMsg: {
......@@ -1305,7 +1305,7 @@
//从电商过来的参数处理
this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType : 0;
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? parseInt(this.orderObj.ReFinanceId) : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
}
......@@ -1815,8 +1815,6 @@
this.platformAccount = this.$route.query.platformAccount ? this.$route.query.platformAccount : 0;
this.orderObj = this.$route.query.orderObj&& this.$route.query.orderObj!='undefined' ? JSON.parse(this.$route.query.orderObj) : null;
this.Handmsg = this.$route.query.Handmsg && this.$route.query.Handmsg!='undefined' ? JSON.parse(this.$route.query.Handmsg) : null;
if (this.orderObj != null && this.orderObj.OrderSource === 8 && this.orderObj.tipObj == 1) {
that.Description = "旅客名单:";
that.describeList = JSON.parse(sessionStorage.getItem("TipGuestList"));
......
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