Skip to content

G
gdtel-gztel-school-center-ui
Commit d096c0ef by 罗承锋
Options

Merge remote-tracking branch 'origin/master'

parents 3c557fec 192dd7be
Showing with 43 additions and 47 deletions
.gradle/buildOutputCleanup/cache.properties 0 → 100644
#Wed Dec 23 15:15:35 CST 2020
gradle.version=6.7
src/views/school-center/order/order.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss"/> <a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6"> <a-col :md="4" :sm="6">
<a-form-item label="客户类型："> <a-form-item label="客户类型：">
<a-select v-model="queryParam.userType" style="width: 120px"> <a-select v-model="queryParam.userType" style="width: 120px">
<a-select-option value>全部客户</a-select-option> <a-select-option value>全部客户</a-select-option>
...@@ -81,19 +81,10 @@ ...@@ -81,19 +81,10 @@
<a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button> <a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-dropdown> <a-dropdown>
<a-menu slot="overlay" @click="handleMenuClick"> <a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1"> <a-menu-item key="1"><a-icon type="arrow-up"/>受理单</a-menu-item>
<a-icon type="arrow-up"/> <a-menu-item key="2"><a-icon type="arrow-up"/>快递</a-menu-item>
受理单
</a-menu-item>
<a-menu-item key="2">
<a-icon type="arrow-up"/>
快递
</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px"> <a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button>
导入
<a-icon type="down"/>
</a-button>
</a-dropdown> </a-dropdown>
</a-col> </a-col>
</a-row> </a-row>
...@@ -132,18 +123,18 @@ ...@@ -132,18 +123,18 @@
<p v-if="text=='1'">已审核</p> <p v-if="text=='1'">已审核</p>
</template> </template>
<template slot="operation" slot-scope="text, record"> <template slot="operation" slot-scope="text, record">
<span> <span>
<a @click="showDrawer(record)">查看</a> <a @click="showDrawer(record)">查看</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a @click="abnormal(record.id)">设为异常单</a> <a @click="abnormal(record.id)">设为异常单</a>
<a-divider v-if="record.orderStatus === '待审核' " type="vertical"/> <a-divider v-if="record.orderStatus === '待审核' " type="vertical"/>
<a v-show="record.orderStatus === '待审核'" @click="reviewStudentIdCard(record)">审核学生证</a> <a v-show="record.orderStatus === '待审核'" @click="reviewStudentIdCard(record)">审核学生证</a>
</span> </span>
</template> </template>
</s-table> </s-table>
<!----抽屉-->
<!----抽屉-->
<a-drawer width="1280" placement="right" :closable="false" @close="onClose" :visible="visible"> <a-drawer width="1280" placement="right" :closable="false" @close="onClose" :visible="visible">
<a-form :form="orderInfo"> <a-form :form="orderInfo">
<a-tabs type="card"> <a-tabs type="card">
...@@ -291,9 +282,7 @@ ...@@ -291,9 +282,7 @@
<a-list-item slot="renderItem" slot-scope="item, index"> <a-list-item slot="renderItem" slot-scope="item, index">
<a-card :title="item.title" :bordered="false"> <a-card :title="item.title" :bordered="false">
<a-card-grid style="width:100%;" v-for="item in abnormalInfo"> <a-card-grid style="width:100%;" v-for="item in abnormalInfo">
<div <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;height: 20px">
style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;height: 20px"
>
<a-tooltip placement="left"> <a-tooltip placement="left">
<template slot="title">{{item[index]}}</template> <template slot="title">{{item[index]}}</template>
{{ item[index] }} {{ item[index] }}
...@@ -460,9 +449,22 @@ ...@@ -460,9 +449,22 @@
}, },
orderInfo: {}, orderInfo: {},
columns: [ columns: [
{dataIndex: "customerName", width: 100, title: "客户姓名", fixed: "left"}, {dataIndex: "customerName", width: 90, title: "客户姓名", fixed: "left"},
{dataIndex: "orderNumber", width: 200, title: "订单编号", fixed: "left"}, {dataIndex: "orderStatus", width: 80, title: "订单状态", fixed: "left"},
{dataIndex: "orderStatus", width: 100, title: "订单状态"}, {
dataIndex: "userType",
width: 100,
title: "订单类型",
scopedSlots: {customRender: "userType"}
, fixed: "left"
},
{dataIndex: "businessNumber", width: 120, title: "办理号码"},
{dataIndex: "contactNumber", width: 120, title: "联系号码"},
{dataIndex: "kapin", width: 160, title: "办理套餐"},
{dataIndex: "hehuorenSchool", width: 200, title: "合伙人学校"},
{dataIndex: "hehuorenName", width: 90, title: "合伙人姓名"},
{dataIndex: "hehuorenPhone", width: 120, title: "合伙人手机"},
{ {
dataIndex: "studentCardCheckStatus", dataIndex: "studentCardCheckStatus",
width: 100, width: 100,
...@@ -470,18 +472,7 @@ ...@@ -470,18 +472,7 @@
scopedSlots: {customRender: "studentCardCheckStatus"} scopedSlots: {customRender: "studentCardCheckStatus"}
}, },
{dataIndex: "businessPackage", width: 120, title: "升级套餐"}, {dataIndex: "businessPackage", width: 120, title: "升级套餐"},
{ {dataIndex: "orderNumber", width: 200, title: "订单编号"},
dataIndex: "userType",
width: 100,
title: "订单类型",
scopedSlots: {customRender: "userType"}
},
{dataIndex: "contactNumber", width: 160, title: "联系号码"},
{dataIndex: "businessNumber", width: 160, title: "办理号码"},
{dataIndex: "kapin", width: 200, title: "办理套餐"},
{dataIndex: "hehuorenSchool", width: 220, title: "合伙人学校"},
{dataIndex: "hehuorenName", width: 150, title: "合伙人姓名"},
{dataIndex: "hehuorenPhone", width: 150, title: "合伙人手机"},
{ {
dataIndex: "operation", dataIndex: "operation",
width: 180, width: 180,
...@@ -820,15 +811,18 @@ ...@@ -820,15 +811,18 @@
} }
}); });
}, },
abnormal(orderId) { abnormal(orderId) {
abnormal({orderId}).then(res => { if (confirm("是否设为异常单！")) {
if (res.state == "success") { abnormal({orderId}).then(res => {
this.search(); if (res.state == "success") {
this.$message.success(res.data, 5); this.search();
} else { this.$message.success(res.data, 5);
this.$message.error(res.msg, 5); } else {
} this.$message.error(res.msg, 5);
}); }
});
}
} }
} }
}; };
......
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