Skip to content

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

2

parent b64def01
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 164 deletions
src/components/sale/orderlistbycoffee.vue
View file @ a2624c0b
...@@ -23,16 +23,16 @@ ...@@ -23,16 +23,16 @@
<th width="12%">单号</th> <th width="12%">单号</th>
<th width="7%">数量</th> <th width="7%">数量</th>
<th width="7%">单价</th> <th width="7%">单价</th>
<th width="7%">成交</th> <th width="7%">应收</th>
<th width="7%">应收总额</th>
<th width="7%">实收</th> <th width="7%">实收</th>
<th width="7%">优惠</th> <th width="7%">手续费</th>
<th width="6%">少价金额</th>
<th width="7%">退款</th> <th width="7%">退款</th>
<th width="7%">平台税金</th> <th width="6%">状态</th>
<th width="7%">待收金额</th> <th width="7%"></th>
<th width="7%">状态</th> <th width="7%"></th>
<th v-if="viewType == 0">操作</th> <th width="7%"></th>
<th width="7%"></th>
<th v-if="viewType == 0"></th>
</tr> </tr>
</thead> </thead>
</table> </table>
...@@ -62,158 +62,49 @@ ...@@ -62,158 +62,49 @@
<tbody v-for="(item, index) in dataList" :key="index"> <tbody v-for="(item, index) in dataList" :key="index">
<tr> <tr>
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
<div>{{item.OrderNo}} <div class="order_OfferId" >{{item.OrderId}}</div>
<span v-if="item.OrderId">({{item.OrderId}})</span> <div>{{item.OrderNo}}</div>
<div>
订单类型：
<span v-if="item.OrderType==1">咖啡券</span>
<span v-if="item.OrderType==2">耗材类</span>
<span v-if="item.OrderType==3">教师类</span>
</div> </div>
<div> <div>
用户类型：
<span v-if="item.UserType==1">内部人员</span>
<span v-if="item.UserType==2">学生</span>
<span v-if="item.UserType==3">甲鹤用户</span>
</div> </div>
<div>
<span v-if="item.UserType==1||item.UserType==2">{{item.EmName}}</span>
<span v-if="item.UserType==3">{{item.UserName}}</span>
</div>
<div>付款时间：{{item.PaymentTime}}</div>
<div v-if="item.OrderStatus===3">取消时间：{{item.CancelTime}}</div>
</td> </td>
<td style="border:none;width:7%">{{ item.GuestNum }}</td> <td style="border:none;width:7%">{{ item.Number }}</td>
<td style="border:none;width:7%">{{ item. Unit_Price||0 }}</td> <td style="border:none;width:7%">{{ item.Unit_Price||0 }}</td>
<td style="width:7%" :style="{ <td style="width:7%">{{item.PreferPrice}}</td>
color: <td style="border:none;width:7%">{{item.Income}}</td>
item.Class_Price != item.Unit_Price <td style="border:none;width:7%">{{item.Fee}}</td>
? 'var(--q-color-negative)' <td style="border:none;width:7%">{{item.Refund}}</td>
: '',
border: 'none'
}">
<template v-if="item.Unit_Price >= 0">
{{ item.Unit_Price }}
</template>
<template v-else>
<span class="redstyle">{{ item.Unit_Price }}</span>
</template>
</td>
<td style="border:none;width:7%">
<template v-if="item.PreferPrice >= 0">
{{ item.PreferPrice }}
</template>
<template v-else>
<span class="redstyle">{{ item.PreferPrice }}</span>
</template>
</td>
<td style="border:none;width:7%">
<template v-if="item.Income >= 0">
{{ item.Income }}
</template>
<template v-else>
<span class="redstyle">{{ item.Income }}</span>
</template>
</td>
<td style="color:var(--q-color-negative);border:none;width:7%">
<template v-if="item.DiscountMoney >= 0">
{{ item.DiscountMoney }}
</template>
<template v-else>
<span class="redstyle">{{
item.DiscountMoney
}}</span>
</template>
</td>
<td style="border:none;width:6%"> <td style="border:none;width:6%">
<template v-if="item.LessPrice >= 0">
{{ item.LessPrice }}
</template>
<template v-else>
<span class="redstyle">{{ item.LessPrice }}</span>
</template>
</td>
<td style="border:none;width:7%">
<template v-if="item.Refund >= 0">
{{ item.Refund }}
</template>
<template v-else>
<span class="redstyle">{{ item.Refund }}</span>
</template>
</td>
<td style="border:none;width:7%">
<template v-if="item.PlatformTax >= 0">
{{ item.PlatformTax }}
</template>
<template v-else>
<span class="redstyle">{{ item.PlatformTax }}</span>
</template>
</td>
<td style="color:#2961FE;border:none;width:7%">
<template v-if="item.DueInMoney >= 0">
{{ item.DueInMoney }}
</template>
<template v-else>
<span class="redstyle">{{ item.DueInMoney }}</span>
</template>
</td>
<td style="border:none;width:7%">
<div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center"> <div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center">
<span style="color: #02C499">{{ item.OrderStateName }}</span> <span style="color: #F72E52" v-if="item.OrderStatus==1">待付款</span>
</div> <span style="color: #02C499" v-if="item.OrderStatus==2">已完成</span>
</td> <span style="color: #9E9E9E" v-if="item.OrderStatus==3">已取消</span>
<td v-if="viewType == 0"> </div></td>
<td style="border:none;width:7%"></td>
</td> <td style="border:none;width:7%"></td>
<td style="color:#2961FE;border:none;width:7%"></td>
<td style="border:none;width:7%"></td>
<td v-if="viewType == 0"></td>
</tr> </tr>
<tr> <tr>
<td :colspan="12" style="text-align: left"> <td :colspan="12" style="text-align: left">
<div class="row" v-if="item.GuestList && item.GuestList.length > 0">
学生名单：
<template v-for="(x, j) in item.GuestList" :index="j">
<span v-if="x.GuestState == 1" style="color:#2961FE;margin-right: 5px" :key="j">{{ x.GuestName }}
</span>
<span v-else style="color:red;margin-right: 5px" :key="j">
{{ x.GuestName }}
<q-tooltip :offset="[10, 10]">
{{ x.GuestStateStr }}
</q-tooltip>
</span>
</template>
</div>
<div v-if="
item.GuestList &&
item.GuestList.length > 0
" class="takeContract">
<span @click="isShowPop = true">查看合同</span>
<q-popup-proxy v-if="isShowPop">
<q-banner>
<div style="width: 700px;max-height:220px;overflow:auto;">
<table class="Contract_Table">
<tr>
<th style="width:100px;">姓名</th>
<th style="width:150px;">合同编号</th>
<th style="width:50px;">状态</th>
<th style="width:150px;">上传合同信息</th>
<th style="width:200px;">操作</th>
</tr>
<tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex+10000">
<td>{{ subItem.GuestName }}</td>
<td>
{{ subItem.ContractNo }}
</td>
<td>{{ subItem.ContractStatusStr }}</td>
<td>
<span style="color:var(--q-color-primary);cursor:pointer;"
@click="getShowContract(subItem)">{{ subItem.GuestContractNo }}</span>
</td>
<td>
<template v-if="subItem.ContractId == 0">
</template>
<template v-else>
<q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" />
<q-btn style="margin-left:5px;" v-if="subItem.ContractStatus == 0" color="purple"
size="sm" @click="goContractAudit(subItem)" label="提交审核" />
</template>
</td>
</tr>
</table>
</div>
</q-banner>
</q-popup-proxy>
</div>
<div class="row"> <div class="row">
退课名单： 商品名称：{{item.GoodsName}}
<span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 2"
style="color:var(--q-color-negative);margin-right: 5px" :key="j+20000">{{ x.GuestName }}
</span>
</div> </div>
<span v-if="item.GuestList && item.GuestList.length == 0">暂无</span> <span v-if="item.GuestList && item.GuestList.length == 0">暂无</span>
</td> </td>
...@@ -234,18 +125,11 @@ ...@@ -234,18 +125,11 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
</div>
</template> </template>
<script> <script>
import myOrderForm from "../../components/sale/myOrder-form";
export default { export default {
components: {
myOrderForm
},
props: { props: {
//正常订单 //正常订单
dataList: { dataList: {
...@@ -260,7 +144,6 @@ ...@@ -260,7 +144,6 @@
data() { data() {
return { return {
loading:false, loading:false,
isShowmyorderForm:false,
}; };
}, },
created() { created() {
...@@ -268,9 +151,6 @@ ...@@ -268,9 +151,6 @@
}, },
methods: { methods: {
}, },
mounted(){
console.log(321,this.dataList)
}
}; };
</script> </script>
<style> <style>
......
src/pages/stuMan/stuList.vue
View file @ a2624c0b
...@@ -387,11 +387,11 @@ ...@@ -387,11 +387,11 @@
<q-item-label overline>添加事件</q-item-label> <q-item-label overline>添加事件</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item dense clickable v-close-popup @click="showChangeCourse(props.row)"> <!-- <q-item dense clickable v-close-popup @click="showChangeCourse(props.row)">
<q-item-section> <q-item-section>
<q-item-label overline >跳课</q-item-label> <q-item-label overline >跳课</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item> -->
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
</div> </div>
......
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