Commit af618bb0 by 彭祥礼

....

parent 8da03f91
......@@ -13,7 +13,7 @@ let downloadMoBanKD = (params) => downFilePost(prefix + "order/downloadMoBanKD"
//报表
let reportList = (params) => postAction(prefix + "order/getHhrOrderInfo",params);
let reportDownload = (params) => postAction(prefix + "order/outputHhrOrder",params);
let reportDownload = (params) => downFilePost(prefix + "order/outputHhrOrder",params);
export {
......
......@@ -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-DD HH:mm:ss" />
<a-range-picker @change="onChange" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12">
......@@ -82,15 +82,17 @@
<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>
......@@ -132,10 +134,10 @@
<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 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>
......@@ -246,10 +248,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>
......@@ -359,14 +361,14 @@
width="1024px"
>
<div align="center">
<img :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">
......@@ -382,8 +384,8 @@
</template>
<script>
import STable from "@/components/table";
import {
import STable from "@/components/table";
import {
orderList,
download,
abnormal,
......@@ -391,16 +393,17 @@ import {
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";
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,
......@@ -418,7 +421,7 @@ export default {
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: [],
......@@ -442,7 +445,7 @@ export default {
pStyle2: {
marginBottom: "24px"
},
apis:'',
apis: '',
queryParam: {
createTimeStart: "",
createTimeEnd: "",
......@@ -457,39 +460,39 @@ export default {
},
orderInfo: {},
columns: [
{ dataIndex: "customerName", width: 120, title: "客户姓名", fixed: "left" },
{ dataIndex: "orderNumber", width: 180, title: "订单编号", fixed: "left" },
{ dataIndex: "orderStatus", width: 100, title: "订单状态" },
{dataIndex: "customerName", width: 100, title: "客户姓名", fixed: "left"},
{dataIndex: "orderNumber", width: 200, 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: 120, 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: 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",
width: 200,
width: 180,
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 = {
......@@ -534,7 +537,7 @@ export default {
}
},
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;
......@@ -602,9 +605,9 @@ export default {
},
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) {
......@@ -616,10 +619,10 @@ export default {
onChildrenDrawerClose() {
this.childrenDrawer = false;
},
downloadMoBan: function() {
downloadMoBan: function () {
exportFile(downloadMoBan(), "一人一码受理单.xlsx");
},
downloadMoBanKD: function() {
downloadMoBanKD: function () {
exportFile(downloadMoBanKD(), "快递清单.xlsx");
},
// 执行上传
......@@ -663,7 +666,7 @@ export default {
this.modifyvisible = true;
},
search() {
this.$refs.table.refresh({ search: true });
this.$refs.table.refresh({search: true});
},
onClose() {
this.certificatePhoto = [];
......@@ -706,10 +709,10 @@ export default {
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')
......@@ -803,7 +806,7 @@ export default {
);
},*/
selectOrderHis(orderId) {
selectOrderHis({ orderId }).then(res => {
selectOrderHis({orderId}).then(res => {
let liu = res.data;
for (let i = 0; i < liu.length; i++) {
let resdate = [];
......@@ -818,7 +821,7 @@ export default {
});
},
abnormal(orderId) {
abnormal({ orderId }).then(res => {
abnormal({orderId}).then(res => {
if (res.state == "success") {
this.search();
this.$message.success(res.data, 5);
......@@ -828,32 +831,37 @@ export default {
});
}
}
};
};
</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>
......@@ -7,7 +7,7 @@
<a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="时间选择:">
<a-range-picker @change="onChange" />
<a-range-picker @change="onChange"/>
</a-form-item>
</a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
......@@ -16,7 +16,7 @@
<a-button v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-button v-show="callback" style="margin-left: 10px">
导出中
<a-spin style="margin-left: 5px" size="small" />
<a-spin style="margin-left: 5px" size="small"/>
</a-button>
</a-col>
</span>
......@@ -38,11 +38,12 @@
</template>
<script>
import STable from "@/components/table";
import { reportList, reportDownload } from "@/api/school-center/orderAPI";
import { cloneObject, exportFile } from "@/utils/util";
import moment from "moment";
export default {
import STable from "@/components/table";
import {reportList, reportDownload} from "../../../api/school-center/orderAPI";
import {cloneObject, exportFile} from "@/utils/util";
import moment from "moment";
export default {
name: "hhrReport",
components: {
STable
......@@ -57,98 +58,58 @@ export default {
endTime: ""
},
columns: [
{
title: "时间",
fixed: "left",
children: [
{
title: "业务类型",
children: [
{
title: "县分",
dataIndex: "subName",
width: 80
},
{
dataIndex: "schoolNum",
width: 80,
title: "学校数"
},
{
dataIndex: "studentNum",
width: 80,
title: "学生数"
}
{title: "时间", fixed: "left", children: [
{title: "业务类型", children: [
{title: "县分", dataIndex: "subName", width: 80},
{dataIndex: "schoolNum", width: 80, title: "学校数"},
{dataIndex: "studentNum", width: 80, title: "学生数"}
]
}
]
},
{
title: "本周",
children: [
{
title: "新增",
children: [
{ dataIndex: "newUserNumWeek", width: 80,title: "新用户" },
{ dataIndex: "newAloneNumWeek",width: 80, title: "单宽带" },
{ dataIndex: "newMixNumWeek", width: 80,title: "融合宽带" }
{title: "本周", children: [
{title: "新增", children: [
{dataIndex: "newUserNumWeek", width: 80, title: "新用户"},
{dataIndex: "newAloneNumWeek", width: 80, title: "单宽带"},
{dataIndex: "newMixNumWeek", width: 80, title: "融合宽带"}
]
},
{
title: "存量",
children: [
{ dataIndex: "oldUserNumWeek",width: 100, title: "老用户办理" },
{
dataIndex: "oldContinueNumWeek",
width: 100,
title: "老用户续约"
}
{title: "存量", children: [
{dataIndex: "oldUserNumWeek", width: 100, title: "老用户办理"},
{dataIndex: "oldContinueNumWeek", width: 100, title: "老用户续约"}
]
},
{
title: "已竣工",
children: [
{ dataIndex: "finishNewNumWeek",width: 80, title: "新增" },
{ dataIndex: "finishOldNumWeek", width: 80,title: "存量" }
{title: "已竣工", children: [
{dataIndex: "finishNewNumWeek", width: 80, title: "新增"},
{dataIndex: "finishOldNumWeek", width: 80, title: "存量"}
]
},
{ dataIndex: "sumWeek", width: 80,title: "总计" }
{dataIndex: "sumWeek", width: 80, title: "总计"}
]
},
{
title: "本月",
children: [
title: "本月", children:
[
{
title: "新增",
children: [
{ dataIndex: "newUserNumMonth",width: 80, title: "新用户" },
{ dataIndex: "newAloneNumMonth", width: 80,title: "单宽带" },
{ dataIndex: "newMixNumMonth",width: 80, title: "融合宽带" }
title: "新增", children: [
{dataIndex: "newUserNumMonth", width: 80, title: "新用户"},
{dataIndex: "newAloneNumMonth", width: 80, title: "单宽带"},
{dataIndex: "newMixNumMonth", width: 80, title: "融合宽带"}
]
},
{
title: "存量",
children: [
{
dataIndex: "oldUserNumMonth",
width: 100,
title: "老用户办理"
},
{
dataIndex: "oldContinueNumMonth",
width: 100,
title: "老用户续约"
}
title: "存量", children: [
{dataIndex: "oldUserNumMonth", width: 100, title: "老用户办理"},
{dataIndex: "oldContinueNumMonth", width: 100, title: "老用户续约"}
]
},
{
title: "已竣工",
children: [
{ dataIndex: "finishNewNumMonth",width: 80, title: "新增" },
{ dataIndex: "finishOldNumMonth",width: 80, title: "存量" }
title: "已竣工", children: [
{dataIndex: "finishNewNumMonth", width: 80, title: "新增"},
{dataIndex: "finishOldNumMonth", width: 80, title: "存量"}
]
},
{ dataIndex: "sumMonth", width: 80,title: "总计" }
{dataIndex: "sumMonth", width: 80, title: "总计"}
]
},
{
......@@ -157,15 +118,15 @@ export default {
{
title: "新增",
children: [
{ dataIndex: "newUserNumAll",width: 80, title: "新用户" },
{ dataIndex: "newAloneNumAll",width: 80, title: "单宽带" },
{ dataIndex: "newMixNumAll",width: 80, title: "融合宽带" }
{dataIndex: "newUserNumAll", width: 80, title: "新用户"},
{dataIndex: "newAloneNumAll", width: 80, title: "单宽带"},
{dataIndex: "newMixNumAll", width: 80, title: "融合宽带"}
]
},
{
title: "存量",
children: [
{ dataIndex: "oldUserNumAll",width: 100, title: "老用户办理" },
{dataIndex: "oldUserNumAll", width: 100, title: "老用户办理"},
{
dataIndex: "oldContinueNumAll",
width: 100,
......@@ -176,11 +137,11 @@ export default {
{
title: "已竣工",
children: [
{ dataIndex: "finishNewNumAll", width: 80,title: "新增" },
{ dataIndex: "finishOldNumAll",width: 80, title: "存量" }
{dataIndex: "finishNewNumAll", width: 80, title: "新增"},
{dataIndex: "finishOldNumAll", width: 80, title: "存量"}
]
},
{ dataIndex: "sumAll",width: 80, title: "总计" }
{dataIndex: "sumAll", width: 80, title: "总计"}
]
}
],
......@@ -212,7 +173,7 @@ export default {
methods: {
moment,
search() {
this.$refs.table.refresh({ search: true });
this.$refs.table.refresh({search: true});
},
//时间事件
onChange(date, dateString) {
......@@ -228,12 +189,7 @@ export default {
this.callback = true;
let today = new Date();
today.setTime(today.getTime());
let s2 =
today.getFullYear() +
"-" +
(today.getMonth() + 1) +
"-" +
today.getDate();
let s2 = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
exportFile(
reportDownload(),
"一人一码统计报表" + s2 + ".xlsx",
......@@ -244,7 +200,7 @@ export default {
this.callback = false;
}
}
};
};
</script>
<style scoped>
......
......@@ -218,7 +218,7 @@
subNames: [],
columns: [
{dataIndex: 'orderPhone', width: 25, title: '放号号码', align: "center"},
{dataIndex: 'salesSchool', width: 30, title: '放号学校', align: "center"},
{dataIndex: 'salesSchool', width: 40, title: '放号学校', align: "center"},
{dataIndex: 'salesSubst', width: 15, title: '放号县分', align: "center"},
{dataIndex: 'name', width: 25, title: '放号人', align: "center"},
{dataIndex: 'account', width: 30, title: '放号人账号', align: "center"},
......
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