Skip to content

C
confucius
Commit 12dee782 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 778f714d
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 70 deletions
src/pages/activity/activeSignUpList.vue
View file @ 12dee782
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<template v-slot:body-cell-Status="props"> <template v-slot:body-cell-Status="props">
<q-td :props="props"> <q-td :props="props">
<span v-if="props.row.Status===0">正常</span> <span v-if="props.row.Status===0">正常</span>
<span v-if="props.row.Status===1">删除</span> <span v-if="props.row.Status===1">取消</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-OrderStatus="props"> <template v-slot:body-cell-OrderStatus="props">
...@@ -159,25 +159,20 @@ ...@@ -159,25 +159,20 @@
<span v-if="props.row.OrderStatus===1">已支付</span> <span v-if="props.row.OrderStatus===1">已支付</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-IsApplyForCancel="props"> <template v-slot:body-cell-quxiaomoney="props">
<q-td :props="props"> <q-td :props="props" >
<span v-if="props.row.IsApplyForCancel===1">是</span> <span v-if="props.row.Status===1">{{props.row.Money}}</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> </q-td>
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props" v-if="props.row.IsApplyForCancel==1"> <q-td :props="props" v-if="props.row.IsApplyForCancel==1&&props.row.Status===0">
<div> <div>
<q-btn flat size="xs" icon="edit" <q-btn flat size="xs" icon="edit"
color="accent" style="font-weight:400" label="同意" @click="editQuotation(props.row)" /> color="accent" style="font-weight:400" label="同意" @click="agreeApply(props.row)" />
<q-btn flat size="xs" icon="edit" <q-btn flat size="xs" icon="edit"
color="accent" style="font-weight:400" label="拒绝" @click="delType(props.row)" /> color="accent" style="font-weight:400" label="拒绝" @click="jujueMsg(props.row)" />
</div> </div>
</q-td> </q-td>
</template> </template>
...@@ -187,6 +182,16 @@ ...@@ -187,6 +182,16 @@
</template> </template>
</q-table> </q-table>
</div> </div>
<!-- 拒绝报名 -->
<el-dialog title="拒绝报名" :visible.sync="showJujue" width="600px">
<div class="activityFlex">
<el-input type="textarea" rows="4" v-model="bdMsg.RejectRemark"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="sureJujue">确定</el-button> -->
<q-btn color="accent" size="sm" class="q-mr-md" label="确定" @click="sureJujue" />
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -203,7 +208,8 @@ ...@@ -203,7 +208,8 @@
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
ActivityId:0, ActivityId:0,
EnrollState:3 EnrollState:3,
rowsPerPage:1000
}, },
pageCount: 0, pageCount: 0,
columns: [ columns: [
...@@ -259,15 +265,8 @@ ...@@ -259,15 +265,8 @@
align: "left" align: "left"
}, },
{ {
name: " IsApplyForCancel", name: " quxiaomoney",
label: "是否申请取消", label: "取消金额",
field:" IsApplyForCancel",
align: "left"
},
{
name: " ApplyForCancelStatus",
label: "申请取消审核状态",
field:" ApplyForCancelStatus",
align: "left" align: "left"
}, },
{ {
...@@ -278,12 +277,19 @@ ...@@ -278,12 +277,19 @@
}, },
{ {
name: 'optioned', name: 'optioned',
label: '操作', label: '申请取消审核状态',
align: "left" align: "left"
} }
], ],
showForm:false, showForm:false,
typeObj:{} typeObj:{},
bdMsg: {
Id: 0, //报名id
ApplyForCancelStatus: 1, //申请取消审核状态 1同意 2拒绝
RejectRemark: ''
},
showJujue:false,
} }
}, },
...@@ -305,6 +311,42 @@ ...@@ -305,6 +311,42 @@
} }
}) })
}, },
//同意
agreeApply(item) {
console.log(305,item)
this.bdMsg.Id = item.Id;
this.bdMsg.ApplyForCancelStatus = 1;
this.apipostDS("/api/Education/SetCommerceConsultApplyCancel", this.bdMsg, res => {
if (res.data.resultCode == 1) {
// location.reload();
this.Success("操作成功")
this.getList()
} else {
this.Error(res.data.message);
}
})
},
jujueMsg(item){
this.bdMsg.Id = item.Id;
this.showJujue=true;
},
// 拒绝
sureJujue(){
if(!this.bdMsg.RejectRemark){
this.Error("请输入拒绝原因")
return
}
this.bdMsg.ApplyForCancelStatus = 2;
this.apipostDS("/api/Education/SetCommerceConsultApplyCancel", this.bdMsg, res => {
if (res.data.resultCode == 1) {
this.showJujue=false;
this.Success("操作成功")
this.getList()
} else {
this.Error(res.data.message);
}
})
},
goBack(){ goBack(){
this.$router.go(-1) this.$router.go(-1)
} }
......
src/pages/activity/activityList.vue
View file @ 12dee782
...@@ -324,15 +324,7 @@ ...@@ -324,15 +324,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> --> </el-dialog> -->
<!-- 拒绝报名 -->
<!-- <el-dialog title="拒绝报名" :visible.sync="showJujue" width="600px">
<div class="activityFlex">
<el-input type="textarea" rows="4" v-model="bdMsg.RejectRemark"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="sureJujue">确定</el-button>
</span>
</el-dialog> -->
</div> </div>
</template> </template>
<script> <script>
...@@ -445,12 +437,7 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -445,12 +437,7 @@ import ActiveForm from '../../components/activity/active-from'
// EnrollState: 1, // EnrollState: 1,
// ActivityId: 0 // ActivityId: 0
// }, // },
// bdMsg: {
// Id: 0, //报名id
// ApplyForCancelStatus: 1, //申请取消审核状态 1同意 2拒绝
// RejectRemark: ''
// },
// showJujue:false,
showForm:false, showForm:false,
typeObj:{} typeObj:{}
} }
...@@ -465,35 +452,8 @@ import ActiveForm from '../../components/activity/active-from' ...@@ -465,35 +452,8 @@ import ActiveForm from '../../components/activity/active-from'
// this.joinMsg.ActivityId = item.Id; // this.joinMsg.ActivityId = item.Id;
// this.getJoinData(); // this.getJoinData();
// }, // },
//确定
// agreeApply(item) {
// this.bdMsg.Id = item.Id;
// this.bdMsg.ApplyForCancelStatus = 1;
// this.apipostDS("/api/Education/SetCommerceConsultApplyCancel", this.bdMsg, res => {
// if (res.data.resultCode == 1) {
// location.reload();
// } else {
// this.Error(res.data.message);
// }
// })
// },
// jujueMsg(item){
// this.bdMsg.Id = item.Id;
// this.showJujue=true;
// },
// //取消
// sureJujue(){
// this.bdMsg.ApplyForCancelStatus = 2;
// this.apipostDS("/api/Education/SetCommerceConsultApplyCancel", this.bdMsg, res => {
// if (res.data.resultCode == 1) {
// this.getList();
// this.dialogTableVisible=false;
// this.showJujue=false;
// } else {
// this.Error(res.data.message);
// }
// })
// },
//获取活动类型下拉 //获取活动类型下拉
getActiveTypeList(){ getActiveTypeList(){
this.apipostDS("/api/Education/GetCommerceActivityTypeList",{},(res)=>{ this.apipostDS("/api/Education/GetCommerceActivityTypeList",{},(res)=>{
......
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