Commit 757ea28e by 陈浩建

一人一码订单页面调整

parent d096c0ef
...@@ -10,19 +10,20 @@ let reviewStudentIdCard = (params) => postAction(prefix +"order/reviewStudentIdC ...@@ -10,19 +10,20 @@ let reviewStudentIdCard = (params) => postAction(prefix +"order/reviewStudentIdC
let abnormal = (params) => postAction(prefix +"order/abnormal" , params); let abnormal = (params) => postAction(prefix +"order/abnormal" , params);
let downloadMoBan = (params) => downFilePost(prefix + "order/downloadMoBan" , params); let downloadMoBan = (params) => downFilePost(prefix + "order/downloadMoBan" , params);
let downloadMoBanKD = (params) => downFilePost(prefix + "order/downloadMoBanKD" , params); let downloadMoBanKD = (params) => downFilePost(prefix + "order/downloadMoBanKD" , params);
let downloadMoBanYZK = (params) => downFilePost(prefix + "order/downloadMoBanYZK" , params);
//报表 //报表
let reportList = (params) => postAction(prefix + "order/getHhrOrderInfo",params); let reportList = (params) => postAction(prefix + "order/getHhrOrderInfo",params);
let reportDownload = (params) => downFilePost(prefix + "order/outputHhrOrder",params); let reportDownload = (params) => downFilePost(prefix + "order/outputHhrOrder",params);
export { export {
orderList, orderList,
download, download,
selectOrderHis, selectOrderHis,
abnormal, abnormal,
downloadMoBan, downloadMoBan,
downloadMoBanKD, downloadMoBanKD,
downloadMoBanYZK,
reportList, reportList,
reviewStudentIdCard, reviewStudentIdCard,
reportDownload reportDownload
......
...@@ -5,56 +5,81 @@ ...@@ -5,56 +5,81 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12" style="height:35px">
<a-form-item label="时间选择:"> <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-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="6"> <a-col :md="6" :sm="12" style="height:35px">
<a-form-item label="订单完成时间:">
<a-range-picker @change="onSuccessChange" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="6" style="height:35px">
<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>
<a-select-option value="1">老用户办理</a-select-option> <a-select-option value="1">老用户办理</a-select-option>
<a-select-option value="0">新用户办理</a-select-option> <a-select-option value="0">新用户办理</a-select-option>
<a-select-option value="2">老用户续约</a-select-option> <a-select-option value="2">老用户续约</a-select-option>
<a-select-option value="3">融合办理</a-select-option> <!-- <a-select-option value="3">融合办理</a-select-option>-->
<a-select-option value="4">抽奖业务</a-select-option> <a-select-option value="4">抽奖业务</a-select-option>
<a-select-option value="5">单宽业务</a-select-option> <!-- <a-select-option value="5">单宽业务</a-select-option>-->
<a-select-option value="6">羊城通业务</a-select-option> <a-select-option value="6">羊城通业务</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12">
<a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="订单编号:"> <a-form-item label="订单编号:">
<a-input placeholder="订单编号" v-model="queryParam.orderNumber"></a-input> <a-input placeholder="订单编号" v-model="queryParam.orderNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="6" style="height:35px">
<a-form-item label="县份:">
<a-select v-model="queryParam.hehuorenArea" style="width: 120px">
<a-select-option value>请选择</a-select-option>
<a-select-option value="本部">本部</a-select-option>
<a-select-option value="白云">白云</a-select-option>
<a-select-option value="海珠">海珠</a-select-option>
<a-select-option value="荔湾">荔湾</a-select-option>
<a-select-option value="东山">东山</a-select-option>
<a-select-option value="花都">花都</a-select-option>
<a-select-option value="天河">天河</a-select-option>
<a-select-option value="黄埔">黄埔</a-select-option>
<a-select-option value="番禺">番禺</a-select-option>
<a-select-option value="增城">增城</a-select-option>
<a-select-option value="从化">从化</a-select-option>
<a-select-option value="南沙">南沙</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="客户姓名:"> <a-form-item label="客户姓名:">
<a-input placeholder="客户姓名" v-model="queryParam.customerName"></a-input> <a-input placeholder="客户姓名" v-model="queryParam.customerName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="办理号码:"> <a-form-item label="办理号码:">
<a-input placeholder="办理号码" v-model="queryParam.businessNumber"></a-input> <a-input placeholder="办理号码" v-model="queryParam.businessNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="联系号码:"> <a-form-item label="联系号码:">
<a-input placeholder="联系号码" v-model="queryParam.contactNumber"></a-input> <a-input placeholder="联系号码" v-model="queryParam.contactNumber"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="合伙人姓名:"> <a-form-item label="合伙人姓名:">
<a-input placeholder="合伙人姓名" v-model="queryParam.hehuorenName"></a-input> <a-input placeholder="合伙人姓名" v-model="queryParam.hehuorenName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="12" style="height:35px">
<a-form-item label="合伙人学校:"> <a-form-item label="合伙人学校:">
<a-input placeholder="合伙人学校" v-model="queryParam.hehuorenSchool"></a-input> <a-input placeholder="合伙人学校" v-model="queryParam.hehuorenSchool"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6" style="height:35px">
<a-form-item label="状态:"> <a-form-item label="状态:">
<a-select v-model="queryParam.orderStatus"> <a-select v-model="queryParam.orderStatus">
<a-select-option value>请选择</a-select-option> <a-select-option value>请选择</a-select-option>
...@@ -76,7 +101,7 @@ ...@@ -76,7 +101,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="8" :sm="12" style="float:right;height:35px">
<a-button @click="search()" type="primary">查询</a-button> <a-button @click="search()" type="primary">查询</a-button>
<a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button> <a-button @click="handleSubmit" style="margin-left: 10px">导出</a-button>
<a-dropdown> <a-dropdown>
...@@ -86,6 +111,7 @@ ...@@ -86,6 +111,7 @@
</a-menu> </a-menu>
<a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button> <a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button>
</a-dropdown> </a-dropdown>
<a-button @click="handleSubmit3" style="margin-left: 8px"><a-icon type="arrow-up"/>预制卡批量填号</a-button>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
...@@ -126,8 +152,8 @@ ...@@ -126,8 +152,8 @@
<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>
...@@ -205,34 +231,34 @@ ...@@ -205,34 +231,34 @@
<p>错误原因:{{ orderInfo.checkFail }}</p> <p>错误原因:{{ orderInfo.checkFail }}</p>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <!-- <a-row>-->
<a-col :span="6"> <!-- <a-col :span="6">-->
<p>宽带账号:{{ orderInfo.netNumber }}</p> <!-- <p>宽带账号:{{ orderInfo.netNumber }}</p>-->
</a-col> <!-- </a-col>-->
<a-col :span="6"> <!-- <a-col :span="6">-->
<p>宽带密码:{{ orderInfo.netPassword }}</p> <!-- <p>宽带密码:{{ orderInfo.netPassword }}</p>-->
</a-col> <!-- </a-col>-->
<a-col :span="6"> <!-- <a-col :span="6">-->
<p>奖品账号:{{ orderInfo.giftAccount }}</p> <!-- <p>奖品账号:{{ orderInfo.giftAccount }}</p>-->
</a-col> <!-- </a-col>-->
<a-col :span="6"> <!-- <a-col :span="6">-->
<p>奖品密码:{{ orderInfo.giftPassword }}</p> <!-- <p>奖品密码:{{ orderInfo.giftPassword }}</p>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
<p>学生证审核状态:{{ orderInfo.studentCardCheckStatus }}</p> <p>学生证审核状态:{{ orderInfo.studentCardCheckStatus }}</p>
</a-col> </a-col>
<!-- <a-col :span="6">-->
<!-- <p>宽带订单id:{{ orderInfo.kdOrderId }}</p>-->
<!-- </a-col>-->
<a-col :span="6"> <a-col :span="6">
<p>宽带订单id:{{ orderInfo.kdOrderId }}</p> <p>预制卡订单号:{{ orderInfo.orderId }}</p>
</a-col>
<a-col :span="6">
<p>智能平台订单号:{{ orderInfo.orderId }}</p>
</a-col>
<a-col :span="6">
<p>智能平台订单状态:{{ orderInfo.thStatus }}</p>
</a-col> </a-col>
<!-- <a-col :span="6">-->
<!-- <p>智能平台订单状态:{{ orderInfo.thStatus }}</p>-->
<!-- </a-col>-->
</a-row> </a-row>
<a-divider orientation="left">附件</a-divider> <a-divider orientation="left">附件</a-divider>
<div v-show="!imgShow">无附件</div> <div v-show="!imgShow">无附件</div>
...@@ -331,6 +357,10 @@ ...@@ -331,6 +357,10 @@
模板下载: 模板下载:
<a-button type="primary" @click="downloadMoBanKD">快递清单模板</a-button> <a-button type="primary" @click="downloadMoBanKD">快递清单模板</a-button>
</p> </p>
<p v-show="YZKmoBan">
模板下载:
<a-button type="primary" @click="downloadMoBanYZK">预制卡模板</a-button>
</p>
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="24" :v-show="KDmoBan"> <a-row :gutter="24" :v-show="KDmoBan">
...@@ -381,6 +411,7 @@ ...@@ -381,6 +411,7 @@
selectOrderHis, selectOrderHis,
downloadMoBan, downloadMoBan,
downloadMoBanKD, downloadMoBanKD,
downloadMoBanYZK,
reviewStudentIdCard reviewStudentIdCard
} from "../../../api/school-center/orderAPI"; } from "../../../api/school-center/orderAPI";
import {cloneObject, exportFile} from "@/utils/util"; import {cloneObject, exportFile} from "@/utils/util";
...@@ -417,6 +448,7 @@ ...@@ -417,6 +448,7 @@
childrenDrawer: false, childrenDrawer: false,
YRYMmoBan: false, YRYMmoBan: false,
KDmoBan: false, KDmoBan: false,
YZKmoBan:false,
importUrl: "", importUrl: "",
importTile: "", importTile: "",
modifyvisible: false, modifyvisible: false,
...@@ -445,6 +477,7 @@ ...@@ -445,6 +477,7 @@
contactNumber: "", contactNumber: "",
hehuorenSchool: "", hehuorenSchool: "",
hehuorenName: "", hehuorenName: "",
hehuorenArea:"",
orderStatus: "" orderStatus: ""
}, },
orderInfo: {}, orderInfo: {},
...@@ -456,7 +489,6 @@ ...@@ -456,7 +489,6 @@
width: 100, width: 100,
title: "订单类型", title: "订单类型",
scopedSlots: {customRender: "userType"} scopedSlots: {customRender: "userType"}
, fixed: "left"
}, },
{dataIndex: "businessNumber", width: 120, title: "办理号码"}, {dataIndex: "businessNumber", width: 120, title: "办理号码"},
{dataIndex: "contactNumber", width: 120, title: "联系号码"}, {dataIndex: "contactNumber", width: 120, title: "联系号码"},
...@@ -616,6 +648,9 @@ ...@@ -616,6 +648,9 @@
downloadMoBanKD: function () { downloadMoBanKD: function () {
exportFile(downloadMoBanKD(), "快递清单.xlsx"); exportFile(downloadMoBanKD(), "快递清单.xlsx");
}, },
downloadMoBanYZK: function () {
exportFile(downloadMoBanYZK(), "预制卡批量填号清单.xlsx");
},
// 执行上传 // 执行上传
doPush(res) { doPush(res) {
console.log(res); console.log(res);
...@@ -638,6 +673,7 @@ ...@@ -638,6 +673,7 @@
this.importTile = ""; this.importTile = "";
this.YRYMmoBan = false; this.YRYMmoBan = false;
this.KDmoBan = false; this.KDmoBan = false;
this.YZKmoBan = false;
this.importUrl = ""; this.importUrl = "";
}, },
createfunctionOk() { createfunctionOk() {
...@@ -656,6 +692,12 @@ ...@@ -656,6 +692,12 @@
this.importUrl = "manager/ciop/order/importExpressDelivery"; this.importUrl = "manager/ciop/order/importExpressDelivery";
this.modifyvisible = true; this.modifyvisible = true;
}, },
handleSubmit3() {
this.importTile = "预制卡批量填号";
this.YZKmoBan = true;
this.importUrl = "manager/ciop/order/importPrefabrication";
this.modifyvisible = true;
},
search() { search() {
this.$refs.table.refresh({search: true}); this.$refs.table.refresh({search: true});
}, },
...@@ -757,6 +799,7 @@ ...@@ -757,6 +799,7 @@
this.selectOrderHis(data.id); this.selectOrderHis(data.id);
this.visible = true; this.visible = true;
}, },
//时间事件 //时间事件
onChange(date, dateString) { onChange(date, dateString) {
if (dateString.length == 0) { if (dateString.length == 0) {
...@@ -767,6 +810,16 @@ ...@@ -767,6 +810,16 @@
this.queryParam.createTimeEnd = dateString[1]; this.queryParam.createTimeEnd = dateString[1];
} }
}, },
onSuccessChange(date, dateString) {
if (dateString.length == 0) {
this.queryParam.successTimeStart = "";
this.queryParam.successTimeEnd = "";
} else {
this.queryParam.successTimeStart = dateString[0];
this.queryParam.successTimeEnd = dateString[1];
}
},
handleSubmit() { handleSubmit() {
let downqueryParam = this.queryParam; let downqueryParam = this.queryParam;
download(downqueryParam).then(res => { download(downqueryParam).then(res => {
......
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