Commit f5953875 by 彭祥礼

Revert "订单页面调整"

This reverts commit a32b3543
parent 15d8446d
......@@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="时间选择:">
<a-range-picker @change="onChange" format="YYYY-MM"/>
<a-range-picker @change="onChange" format="YYYY-MM" />
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
......@@ -82,17 +82,15 @@
<a-dropdown>
<a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item key="1">
<a-icon type="arrow-up"/>
受理单
<a-icon type="arrow-up" />受理单
</a-menu-item>
<a-menu-item key="2">
<a-icon type="arrow-up"/>
快递
<a-icon type="arrow-up" />快递
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px">
导入
<a-icon type="down"/>
<a-icon type="down" />
</a-button>
</a-dropdown>
</a-col>
......@@ -128,19 +126,17 @@
<p v-if="text=='6'">羊城通业务</p>
</template>
<template slot="studentCardCheckStatus" slot-scope="text">
<p v-if="text=='0'">审核不通过</p>
<p v-if="text=='1'">审核通过</p>
<p v-if="text==null">待审核</p>
<p v-if="text=='0'">未审核</p>
<p v-if="text=='1'">已审核</p>
</template>
<template slot="operation" slot-scope="text, record">
<span>
<a @click="showDrawer(record)">查看</a>
<a-divider type="vertical"/>
<a-divider type="vertical" />
<a @click="abnormal(record.id)">设为异常单</a>
<a-divider type="vertical"/>
<a v-show="record.studentCardCheckStatus == null" @click="reviewStudentIdCard(record)">审核学生证</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>
</span>
</template>
</s-table>
......@@ -250,10 +246,10 @@
<div v-show="imgShow" style="margin-bottom: 50px">
<a-carousel arrows dotsClass="slick-dots slick-thumb">
<a slot="customPaging" slot-scope="props">
<img :src="getImgUrl(props.i)"/>
<img :src="getImgUrl(props.i)" />
</a>
<div @click="pictureSize" v-for="item in certificatePhoto.length">
<img :style="imgStype" :src="certificatePhoto[item - 1]"/>
<img :style="imgStype" :src="certificatePhoto[item - 1]" />
</div>
</a-carousel>
</div>
......@@ -293,7 +289,9 @@
<a-list-item slot="renderItem" slot-scope="item, index">
<a-card :title="item.title" :bordered="false">
<a-card-grid style="width:100%;" v-for="item in abnormalInfo">
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;height: 20px">
<div
style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;height: 20px"
>
<a-tooltip placement="left">
<template slot="title">{{item[index]}}</template>
{{ item[index] }}
......@@ -361,14 +359,14 @@
width="1024px"
>
<div align="center">
<van-image width="100" height="100" :src="reviewStudentImg" />
<img :src="reviewStudentImg" />
</div>
<a-row :gutter="24" style="text-align: right">
<a-col :md="6" :sm="12">
<p>审核状态:</p>
</a-col>
<a-col :md="6" :sm="12">
<a-radio-group :options="options" v-model="reviewStudent.studentCardCheckStatus"/>
<a-radio-group :options="options" v-model="reviewStudent.studentCardCheckStatus" />
</a-col>
</a-row>
<a-row :gutter="24" style="text-align: right">
......@@ -384,8 +382,8 @@
</template>
<script>
import STable from "@/components/table";
import {
import STable from "@/components/table";
import {
orderList,
download,
abnormal,
......@@ -393,20 +391,16 @@
downloadMoBan,
downloadMoBanKD,
reviewStudentIdCard
} from "@/api/school-center/orderAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity";
import ImportBtn from "../../../components/sysmanage/ImportBtn";
import Vue from 'vue';
import { Image as VanImage } from 'vant';
Vue.use(VanImage);
const options = [
{label: "审核通过", value: "1"},
{label: "审核不通过", value: "0"}
];
export default {
} from "@/api/school-center/orderAPI";
import { cloneObject, exportFile } from "@/utils/util";
import moment from "moment";
import ConstantActivity from "@/constant/ConstantActivity";
import ImportBtn from "../../../components/sysmanage/ImportBtn";
const options = [
{ label: "审核通过", value: "1" },
{ label: "审核不通过", value: "0" }
];
export default {
name: "orderView",
components: {
STable,
......@@ -424,7 +418,7 @@
options,
review: false,
imgShow: false,
imgStype: {width: "300px", heigth: "300px"},
imgStype: { width: "300px", heigth: "300px" },
baseUrl:
"https://raw.githubusercontent.com/vueComponent/ant-design-vue/master/components/vc-slick/assets/img/react-slick/",
certificatePhoto: [],
......@@ -448,7 +442,7 @@
pStyle2: {
marginBottom: "24px"
},
apis: '',
apis:'',
queryParam: {
createTimeStart: "",
createTimeEnd: "",
......@@ -463,39 +457,39 @@
},
orderInfo: {},
columns: [
{dataIndex: "customerName", width: 120, title: "客户姓名", fixed: "left"},
{dataIndex: "orderNumber", width: 180, title: "订单编号", fixed: "left"},
{dataIndex: "orderStatus", width: 100, title: "订单状态"},
{ dataIndex: "customerName", width: 120, title: "客户姓名", fixed: "left" },
{ dataIndex: "orderNumber", width: 180, title: "订单编号", fixed: "left" },
{ dataIndex: "orderStatus", width: 100, title: "订单状态" },
{
dataIndex: "studentCardCheckStatus",
width: 100,
title: "学生证状态",
scopedSlots: {customRender: "studentCardCheckStatus"}
scopedSlots: { customRender: "studentCardCheckStatus" }
},
{dataIndex: "businessPackage", width: 180, title: "升级套餐"},
{ dataIndex: "businessPackage", width: 180, title: "升级套餐" },
{
dataIndex: "userType",
width: 100,
title: "订单类型",
scopedSlots: {customRender: "userType"}
scopedSlots: { customRender: "userType" }
},
{dataIndex: "contactNumber", width: 200, title: "联系号码"},
{dataIndex: "businessNumber", width: 200, title: "办理号码"},
{dataIndex: "kapin", width: 200, title: "办理套餐"},
{dataIndex: "hehuorenSchool", width: 220, title: "合伙人学校"},
{dataIndex: "hehuorenName", width: 150, title: "合伙人姓名"},
{dataIndex: "hehuorenPhone", width: 150, title: "合伙人手机"},
{ dataIndex: "contactNumber", width: 200, title: "联系号码" },
{ dataIndex: "businessNumber", width: 200, title: "办理号码" },
{ dataIndex: "kapin", width: 200, title: "办理套餐" },
{ dataIndex: "hehuorenSchool", width: 220, title: "合伙人学校" },
{ dataIndex: "hehuorenName", width: 150, title: "合伙人姓名" },
{ dataIndex: "hehuorenPhone", width: 150, title: "合伙人手机" },
{
dataIndex: "operation",
width: 220,
width: 200,
title: "操作",
scopedSlots: {customRender: "operation"},
scopedSlots: { customRender: "operation" },
fixed: "right"
}
],
rowdata: parameter => {
const env = process.env.NODE_ENV; //获取当前环境
if (env === 'development') { //测试环境默认添加前缀
if(env === 'development'){ //测试环境默认添加前缀
this.apis = '/api/';
}
let params = {
......@@ -540,7 +534,7 @@
}
},
reviewStudentIdCard(res) {
this.reviewStudentImg = this.apis + res.studenCard;
this.reviewStudentImg =this.apis + res.studenCard;
/*this.reviewStudentImg =this.baseUrl+'abstract0'+1+'.jpg'*/
this.reviewStudent.studentCardCheckStatus = res.studentCardCheckStatus;
this.reviewStudent.checkFail = res.checkFail;
......@@ -608,9 +602,9 @@
},
pictureSize() {
if (this.imgStype.width == "700px") {
this.imgStype = {width: "300px", heigth: "300px"};
this.imgStype = { width: "300px", heigth: "300px" };
} else {
this.imgStype = {width: "700px", heigth: "500px"};
this.imgStype = { width: "700px", heigth: "500px" };
}
},
getImgUrl(i) {
......@@ -622,10 +616,10 @@
onChildrenDrawerClose() {
this.childrenDrawer = false;
},
downloadMoBan: function () {
downloadMoBan: function() {
exportFile(downloadMoBan(), "一人一码受理单.xlsx");
},
downloadMoBanKD: function () {
downloadMoBanKD: function() {
exportFile(downloadMoBanKD(), "快递清单.xlsx");
},
// 执行上传
......@@ -669,7 +663,7 @@
this.modifyvisible = true;
},
search() {
this.$refs.table.refresh({search: true});
this.$refs.table.refresh({ search: true });
},
onClose() {
this.certificatePhoto = [];
......@@ -712,10 +706,10 @@
this.visible = false;
},
showDrawer(data) {
this.certificatePhoto.push(this.apis + data.idCardz);
this.certificatePhoto.push(this.apis + data.idCardf);
this.certificatePhoto.push(this.apis + data.idCardzs);
this.certificatePhoto.push(this.apis + data.studenCard);
this.certificatePhoto.push( this.apis+data.idCardz);
this.certificatePhoto.push(this.apis+data.idCardf);
this.certificatePhoto.push(this.apis+data.idCardzs);
this.certificatePhoto.push(this.apis+data.studenCard);
/* this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
this.certificatePhoto.push('http://yrym.winsun-aly.com/gdtel-xyzx-hhr/images/yrym-ruanyan-logo.png')
......@@ -809,7 +803,7 @@
);
},*/
selectOrderHis(orderId) {
selectOrderHis({orderId}).then(res => {
selectOrderHis({ orderId }).then(res => {
let liu = res.data;
for (let i = 0; i < liu.length; i++) {
let resdate = [];
......@@ -824,7 +818,7 @@
});
},
abnormal(orderId) {
abnormal({orderId}).then(res => {
abnormal({ orderId }).then(res => {
if (res.state == "success") {
this.search();
this.$message.success(res.data, 5);
......@@ -834,37 +828,32 @@
});
}
}
};
};
</script>
<style scoped>
.ant-carousel >>> .slick-dots {
.ant-carousel >>> .slick-dots {
height: auto;
}
.ant-carousel >>> .slick-slide img {
}
.ant-carousel >>> .slick-slide img {
border: 5px solid #fff;
display: block;
margin: auto;
max-width: 80%;
}
.ant-carousel >>> .slick-thumb {
}
.ant-carousel >>> .slick-thumb {
bottom: -45px;
}
.ant-carousel >>> .slick-thumb li {
}
.ant-carousel >>> .slick-thumb li {
width: 60px;
height: 45px;
}
.ant-carousel >>> .slick-thumb li img {
}
.ant-carousel >>> .slick-thumb li img {
width: 100%;
height: 100%;
filter: grayscale(100%);
}
.ant-carousel >>> .slick-thumb li.slick-active img {
}
.ant-carousel >>> .slick-thumb li.slick-active img {
filter: grayscale(0%);
}
}
</style>
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