Skip to content

E
ElectricitySheep
Commit 5b9dacd0 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent a78e1266
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 59 deletions
src/components/education/educationIndex.vue
View file @ 5b9dacd0
......@@ -179,10 +179,10 @@
<i class="el-icon-menu"></i><span>课程卡自动发放</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/informationManage'}" @click="isChecked='/informationManage',CommonJump('informationManage')">
<i class="el-icon-menu"></i><span>咨讯管理</span>
<i class="el-icon-menu"></i><span>资讯管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/informationEvalution'}" @click="isChecked='/informationEvalution',CommonJump('informationEvalution')">
<i class="el-icon-menu"></i><span>咨讯评价</span>
<i class="el-icon-menu"></i><span>资讯留言</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/educationOrder'}" @click="isChecked='/educationOrder',CommonJump('educationOrder')">
<i class="el-icon-menu"></i><span>课程订单</span>
......
src/components/education/educationOrder.vue
View file @ 5b9dacd0
......@@ -79,7 +79,6 @@
<el-tab-pane v-for="item in orderStatusList" :key="item.Id" :dataId="item.Id" :name="item.Id.toString()"
:label="item.Name">
</el-tab-pane>
<el-tab-pane :dataId="8" label="回收站" :key="8" name="8"></el-tab-pane>
</el-tabs>
<div class="app-order-title">
<div style="width: 55%;">订单信息</div>
......@@ -115,23 +114,9 @@
</div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<!-- <div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">-->
<!-- <span class="el-tag el-tag&#45;&#45;small el-tag&#45;&#45;light">{{item.DeliveryMethodName}}</span>-->
<!-- </div>-->
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag
v-if="item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.DeliveryTime=='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">待确认</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">待出行</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small"
type="success">出行中</el-tag>
<el-tag v-if="item.ReceivingTime!='' && item.FinishTime==''" style="margin-left:5px" size="small"
type="success">出行完成</el-tag>
<el-tag v-if="item.FinishTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
<el-tag v-if="item.OrderStatus==1" size="small" type="success">未付款</el-tag>
<el-tag v-if="item.OrderStatus==5" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" size="small" type="danger">已取消</el-tag>
</div>
<el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
<img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit2(item)" style="right:60px"
......@@ -164,7 +149,7 @@
</div>
<div style="margin-bottom: 5px;">
<span style="margin-right: 10px;">
对应老师：<el-tag size="small" style="margin-right:5px;" v-for="(subItem,index) in list.SpecificationList" :key="index">{{subItem}}</el-tag>
老师：<el-tag size="small" style="margin-right:5px;" v-for="(subItem,index) in list.SpecificationList" :key="index">{{subItem}}</el-tag>
</span>
</div>
<div style="margin-bottom: 5px;" v-if="list.MemberEducationCouponList.length>0">
......@@ -190,18 +175,11 @@
<img v-if="item.OrderStatus!==7" @click="costBtn(list,1)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer"> 保险成本：￥{{list.InsuranceCostMoney}}
<img v-if="item.OrderStatus!==7" @click="costBtn2(list,2)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="cursor:pointer">供应商：{{list.SupplierName !=null ? list.SupplierName :''}}
<img v-if="item.OrderStatus!==7" @click="UpdateSuplier(list)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
</div>
<div flex="cross:center main:center" style="width: 45px;">人数：x {{list.Number}}</div>
</div>
<div style="width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if="TenantId==1">
......@@ -1371,7 +1349,6 @@
this.apipost("/api/order/GetEducationGoodsOrderPageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
console.log(res,'数据');
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
this.tableData = pageData;
......@@ -1384,7 +1361,7 @@
this.getList();
},
getOrderStatus() {
this.apipost("/api/GuideCar/GuidCarOrderStatusEnumList", {}, res => {
this.apipost("/api/Order/EducationOrderStatusEnumList", {}, res => {
this.orderStatusList = res.data.data;
})
},
......
src/components/education/educationOrderDetail.vue
View file @ 5b9dacd0
......@@ -9,9 +9,9 @@
<el-step title="已下单" icon="el-icon-edit" :description="dataInfo.CreateDate">
<i :class="activeStep>0?'step01Active':'step01'" slot="icon"></i>
</el-step>
<template>
<template>
<el-step v-if="dataInfo.PaymentTime=='' && !exitState" title="未付款" icon="el-icon-edit"
description="2020-05-13 16:36:11">
description="2020-05-13 16:36:11">
<i :class="activeStep>1?'step02Active':'step02'" slot="icon"></i>
</el-step>
<el-step v-else title="已付款" icon="el-icon-edit" :description="dataInfo.PaymentTime">
......@@ -25,31 +25,14 @@
</template>
<template v-else>
<template>
<el-step v-if="activeStep>2" title="已确定" icon="el-icon-edit" :description="dataInfo.DeliveryTime">
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step>
<el-step v-else title="待确定" icon="el-icon-edit" description="">
<i :class="activeStep>2?'step03Active':'step03'" slot="icon"></i>
</el-step>
</template>
<template>
<el-step v-if="activeStep==3" title="待出行" icon="el-icon-edit">
<i :class="activeStep==4?'step04Active':'step04'" slot="icon"></i>
</el-step>
<el-step v-else-if="activeStep>3" title="出行完成" icon="el-icon-edit" :description="dataInfo.ReceivingTime">
<i :class="activeStep>3?'step04Active':'step04'" slot="icon"></i>
</el-step>
</template>
<template>
<el-step v-if="activeStep>4" title="已结束" icon="el-icon-edit" :description="dataInfo.FinishTime">
<el-step v-if="activeStep>4" title="已完成" icon="el-icon-edit" :description="dataInfo.FinishTime">
<i :class="activeStep>4?'step05Active':'step05'" slot="icon"></i>
</el-step>
<el-step v-else title="未结束" icon="el-icon-edit">
<el-step v-else title="未完成" icon="el-icon-edit">
<i :class="activeStep==5?'step05Active':'step05'" slot="icon"></i>
</el-step>
</template>
</template>
</el-steps>
</el-card>
<el-row :gutter="16">
......@@ -75,7 +58,7 @@
<span class="label">优惠金额:</span>
<div>￥{{dataInfo.CouponMoney}}</div>
</div>
<div flex="dir:left cross:center" class="item-box">
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.EducationMoney>0">
<span class="label">课程卡抵扣金额:</span>
<div class="express-address" style="width:60%">
￥{{dataInfo.EducationMoney}}
......@@ -274,7 +257,7 @@
<el-table-column prop="name" label="信息" width="300" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SpecificationList.length>0">
对应老师：<el-tag size="small" style="margin-right:5px;" v-for="(SubItem,SubIndex) in scope.row.SpecificationList" :key="SubIndex">{{SubItem}}</el-tag>
老师：<el-tag size="small" style="margin-right:5px;" v-for="(SubItem,SubIndex) in scope.row.SpecificationList" :key="SubIndex">{{SubItem}}</el-tag>
</div>
<div style="margin-top:5px;" v-if="scope.row.MemberEducationCouponList.length>0">
课程卡信息：<span v-for="(childItem,childIndex) in scope.row.MemberEducationCouponList" :key="childIndex">
......@@ -651,9 +634,9 @@
OrderId: this.OrderId
}, res => {
this.dataInfo = res.data.data;
console.log(res,'res');
let data = res.data.data;
console.log(res,'数据');
// 未付款
// 未付款
if (data.PaymentTime == '' && data.DeliveryTime == '') {
this.activeStep = 1;
}
......@@ -674,6 +657,7 @@
else if (data.FinishTime != '') {
this.activeStep = 5;
}
//已取消
if (data.OrderStatus == 7) {
this.exitState = true;
this.activeStep = 5;
......
src/components/education/informationEvalution.vue
View file @ 5b9dacd0
......@@ -7,13 +7,13 @@
</div>
<div class="content">
<div style="margin-bottom:20px">
<span>评价类型</span>
<!-- <span>评价类型</span>
<el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.CommentGrade"
size="small" placeholder="请选择">
<el-option label="全部评价" :value="0"></el-option>
<el-option v-for="item in templateList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-select> -->
<span>所属平台</span>
<el-select class="w100" @change="msg.pageIndex=1,getList()" style="margin-right: 10px;"
v-model="msg.PlatformSource" size="small" placeholder="请选择">
......@@ -48,13 +48,13 @@
<img v-if="scope.row.PlatformSource==1" src="../../assets/img/userman/wx.png" alt="">
</template>
</el-table-column>
<el-table-column label="评价" width="80">
<!-- <el-table-column label="评价" width="80">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="好评" placement="top">
<img v-if="scope.row.CommentGrade==1" src="../../assets/img/userman/good.png" alt="">
</el-tooltip>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="Name" label="详情">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" :content="scope.row.Content" placement="top">
......
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