Commit 25969f24 by 彭祥礼

页面调整

parent af618bb0
...@@ -305,6 +305,7 @@ export function unique (arr) { ...@@ -305,6 +305,7 @@ export function unique (arr) {
*/ */
export function exportFile(pross, name = "data.xlsx", callback) { export function exportFile(pross, name = "data.xlsx", callback) {
pross.then(res =>{ pross.then(res =>{
debugger
let blob = res; let blob = res;
/*let reader = new FileReader(); /*let reader = new FileReader();
reader.readAsDataURL(blob); // 转换为base64,可以直接放入a表情href reader.readAsDataURL(blob); // 转换为base64,可以直接放入a表情href
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<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="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="积分类型"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="积分类型">
<a-select placeholder="请选择" v-model="queryParam.activityType"> <a-select placeholder="请选择" v-model="queryParam.activityType">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="积分小类"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="积分小类">
<a-select placeholder="请选择" v-model="queryParam.subclass"> <a-select placeholder="请选择" v-model="queryParam.subclass">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="姓名:"> <a-form-item label="姓名:">
<a-input placeholder="" v-model="queryParam.name"></a-input> <a-input placeholder="" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="账号:"> <a-form-item label="账号:">
<a-input placeholder="" v-model="queryParam.account"></a-input> <a-input placeholder="" v-model="queryParam.account"></a-input>
</a-form-item> </a-form-item>
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="活动标题:"> <a-form-item label="活动标题:">
<a-input placeholder="活动标题" v-model="queryParam.title"></a-input> <a-input placeholder="活动标题" v-model="queryParam.title"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动类型"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动类型">
<a-select placeholder="请选择" v-model="queryParam.activityType"> <a-select placeholder="请选择" v-model="queryParam.activityType">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动小类"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动小类">
<a-select placeholder="请选择" v-model="queryParam.subclass"> <a-select placeholder="请选择" v-model="queryParam.subclass">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="活动标题:"> <a-form-item label="活动标题:">
<a-input placeholder="活动标题" v-model="queryParam.title"></a-input> <a-input placeholder="活动标题" v-model="queryParam.title"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动类型"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动类型">
<a-select placeholder="请选择" v-model="queryParam.activityType"> <a-select placeholder="请选择" v-model="queryParam.activityType">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动小类"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="活动小类">
<a-select placeholder="请选择" v-model="queryParam.subclass"> <a-select placeholder="请选择" v-model="queryParam.subclass">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="参与者:"> <a-form-item label="参与者:">
<a-input placeholder="活动标题" v-model="queryParam.creator"></a-input> <a-input placeholder="活动标题" v-model="queryParam.creator"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="审核状态"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="审核状态">
<a-select placeholder="请选择" v-model="queryParam.status"> <a-select placeholder="请选择" v-model="queryParam.status">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
......
...@@ -5,32 +5,32 @@ ...@@ -5,32 +5,32 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input> <a-input placeholder="姓名" v-model="queryParam.userName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.substName" @change="getSchoolNames" style="width: 8rem;"> <a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.schoolName" style="width: 15rem;"> <a-select v-model="queryParam.schoolName">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item label="KPI月份"> <a-form-item label="KPI月份">
<a-month-picker @change="onChange" v-model="queryParam.month" placeholder="选择KPI月份" style="width: 8rem;"/> <a-month-picker @change="onChange" v-model="queryParam.month" placeholder="选择KPI月份"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input> <a-input placeholder="姓名" v-model="queryParam.userName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.substName" @change="getSchoolNames" style="width: 8rem;"> <a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</a-col> </a-col>
<a-col :md="5" :sm="10"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.schoolName" style="width: 15rem;"> <a-select v-model="queryParam.schoolName">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="KPI月份"> <a-form-item label="KPI月份">
<a-month-picker @change="onChange" v-model="queryParam.month" placeholder="选择KPI月份" style="width: 8rem;"/> <a-month-picker @change="onChange" v-model="queryParam.month" placeholder="选择KPI月份"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name" style="width: 8rem;"></a-input> <a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
:mode="tempMode" :mode="tempMode"
@panelChange="handlePanelChange" @panelChange="handlePanelChange"
@ok="onOk" @ok="onOk"
style="width: 16rem;"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name" style="width: 8rem;"></a-input> <a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="6" :sm="12">
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
:mode="tempMode" :mode="tempMode"
@panelChange="handlePanelChange" @panelChange="handlePanelChange"
@ok="onOk" @ok="onOk"
style="width: 16rem;"
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
......
...@@ -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="4" :sm="12"> <a-col :md="3" :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>
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
<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="4" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item label="状态:"> <a-form-item label="状态:">
<a-select v-model="queryParam.orderStatus" style="width: 120px"> <a-select v-model="queryParam.orderStatus">
<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>
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<a-input placeholder="学校名称" v-model="queryParam.orderUniversityName" ></a-input> <a-input placeholder="学校名称" v-model="queryParam.orderUniversityName" ></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item label="状态:"> <a-form-item label="状态:">
<a-select v-model="queryParam.status" style="width: 120px" > <a-select v-model="queryParam.status">
<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="4">归档</a-select-option> <a-select-option value="4">归档</a-select-option>
......
...@@ -5,25 +5,25 @@ ...@@ -5,25 +5,25 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="电信激活号码:"> <a-form-item label="电信激活号码:">
<a-input placeholder="" v-model="queryParam.title"></a-input> <a-input placeholder="" v-model="queryParam.title"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item label="放号人:"> <a-form-item label="放号人:">
<a-input placeholder="" v-model="queryParam.name"></a-input> <a-input placeholder="" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="放号账号:"> <a-form-item label="放号账号:">
<a-input placeholder="" v-model="queryParam.account"></a-input> <a-input placeholder="" v-model="queryParam.account"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="审核状态"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="审核状态">
<a-select placeholder="请选择" v-model="queryParam.status"> <a-select placeholder="请选择" v-model="queryParam.status">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="订单类型"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="订单类型">
<a-select placeholder="请选择" v-model="queryParam.orderType"> <a-select placeholder="请选择" v-model="queryParam.orderType">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="overflow: hidden;">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button @click="search()" type="primary">查询</a-button> <a-button @click="search()" type="primary">查询</a-button>
<a-divider type="vertical"/> <a-divider type="vertical"/>
...@@ -84,11 +84,11 @@ ...@@ -84,11 +84,11 @@
</template> </template>
<template slot="operation" slot-scope="text,record"> <template slot="operation" slot-scope="text,record">
<!-- <a @click="modifyfunction(record)">编辑</a>--> <!-- <a @click="modifyfunction(record)">编辑</a>-->
<a-divider type="vertical"/> <!--<a-divider type="vertical"/>-->
<a-popconfirm title="是否要删除此行?" @confirm="deleteOrder(record.id)"> <a-popconfirm title="是否要删除此行?" @confirm="deleteOrder(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical"/> <!--<a-divider type="vertical"/>-->
</template> </template>
<template slot="orderTypeScope" slot-scope="text"> <template slot="orderTypeScope" slot-scope="text">
<p v-if="text=='1'">放号登记</p> <p v-if="text=='1'">放号登记</p>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
{dataIndex: 'upgradeCombo', width: 200, title: '升级套餐', align: "center"}, {dataIndex: 'upgradeCombo', width: 200, title: '升级套餐', align: "center"},
{ {
dataIndex: 'operation', dataIndex: 'operation',
width: 200, width: 120,
title: '操作', title: '操作',
align: "center", align: "center",
scopedSlots: {customRender: 'operation'}, scopedSlots: {customRender: 'operation'},
......
...@@ -7,20 +7,20 @@ ...@@ -7,20 +7,20 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="订单编号:"> <a-form-item label="订单编号:">
<a-input placeholder="订单编号" v-model="queryParam.orderNum" style="width: 12rem;"></a-input> <a-input placeholder="订单编号" v-model="queryParam.orderNum"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="6"> <a-col :md="4" :sm="8">
<a-form-item label="买家账号:"> <a-form-item label="买家账号:">
<a-input placeholder="买家账号" v-model="queryParam.account" style="width:10rem;"></a-input> <a-input placeholder="买家账号" v-model="queryParam.account"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="6"> <a-col :md="4" :sm="8">
<a-form-item label="买家姓名:"> <a-form-item label="买家姓名:">
<a-input placeholder="买家姓名" v-model="queryParam.name" style="width: 8rem;"></a-input> <a-input placeholder="买家姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="付款状态:"> <a-form-item label="付款状态:">
<a-select v-model="queryParam.state" style="width: 8rem;"> <a-select v-model="queryParam.state" style="width: 8rem;">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="4"> <a-col :md="3" :sm="6">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.substName" @change="getSchoolNames" style="width: 6rem;"> <a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</a-col> </a-col>
<a-col :md="5" :sm="10"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.schoolName" style="width: 18rem;"> <a-select v-model="queryParam.schoolName">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="兑换券账号"> <a-form-item label="兑换券账号">
<a-input placeholder="兑换券账号" v-model="queryParam.card" style="width: 8rem;"></a-input> <a-input placeholder="兑换券账号" v-model="queryParam.card"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item label="销售状态"> <a-form-item label="销售状态">
<a-select v-model="queryParam.state" @change="getSchoolNames" style="width: 8rem;"> <a-select v-model="queryParam.state" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option key="1">未出售</a-select-option> <a-select-option key="1">未出售</a-select-option>
<a-select-option key="2">已出售</a-select-option> <a-select-option key="2">已出售</a-select-option>
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12" v-show="false"> <a-col :md="3" :sm="6" v-show="false">
<a-form-item label="上架状态"> <a-form-item label="上架状态">
<a-select v-model="queryParam.shelfState" style="width: 15rem;"> <a-select v-model="queryParam.shelfState">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option key="1">已上架</a-select-option> <a-select-option key="1">已上架</a-select-option>
<a-select-option key="2">已下架</a-select-option> <a-select-option key="2">已下架</a-select-option>
......
...@@ -5,14 +5,20 @@ ...@@ -5,14 +5,20 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<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="3" :sm="6">
<a-form-item label="县分:"> <a-form-item label="县分">
<a-input placeholder="县分" v-model="queryParam.productRegion"></a-input> <a-select v-model="queryParam.productRegion" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校名称"> <a-form-item label="学校">
<a-input placeholder="学校名称" v-model="queryParam.productUniversity"></a-input> <a-select v-model="queryParam.productUniversity">
<a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="12" :sm="12"> <a-col :md="12" :sm="12">
...@@ -170,6 +176,7 @@ ...@@ -170,6 +176,7 @@
universitySchool universitySchool
} from "@/api/school-center/productAPI" } from "@/api/school-center/productAPI"
import {cloneObject} from '@/utils/util'; import {cloneObject} from '@/utils/util';
import {getSchoolNames, initSubstName} from "../../../api/school-center/louZhang/louZhangManagerAPI";
export default { export default {
name: "product", name: "product",
...@@ -194,6 +201,8 @@ ...@@ -194,6 +201,8 @@
productIntroduction: "", productIntroduction: "",
productSetMealIntroduction: '', productSetMealIntroduction: '',
productRf2:'', productRf2:'',
subNames: [],
schoolNames: [],
queryParam: { queryParam: {
productUniversity: '', //适用学校 productUniversity: '', //适用学校
productRegion: '', // 区域 productRegion: '', // 区域
...@@ -451,7 +460,43 @@ ...@@ -451,7 +460,43 @@
productRate: '', productRate: '',
productState: '0' productState: '0'
}) })
},
getSchoolNames() {
this.schoolNames = []
this.queryParam.productUniversity = ''
getSchoolNames({"substName": this.queryParam.productRegion}).then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.schoolName === 'null')
return;
this.schoolNames.push({
value: r.schoolName,
text: r.schoolName
})
})
} }
})
},
initSubstName() {
initSubstName().then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.subName === 'null')
return;
this.subNames.push({
value: r.subName,
text: r.subName
})
})
}
})
}
},
mounted() {
this.initSubstName();
this.getSchoolNames();
} }
} }
</script> </script>
......
...@@ -5,14 +5,21 @@ ...@@ -5,14 +5,21 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="12">
<a-form-item label="县分:"> <a-col :md="3" :sm="6">
<a-input placeholder="县分" v-model="queryParam.universityRegion"></a-input> <a-form-item label="县分">
<a-select v-model="queryParam.universityRegion" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校名称"> <a-form-item label="学校">
<a-input placeholder="学校名称" v-model="queryParam.universityName" ></a-input> <a-select v-model="queryParam.universityName">
<a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
...@@ -101,6 +108,7 @@ ...@@ -101,6 +108,7 @@
import STable from '@/components/table'; import STable from '@/components/table';
import {universityList,universityDelete,universityInsert,universityUpdate} from "@/api/school-center/productAPI" import {universityList,universityDelete,universityInsert,universityUpdate} from "@/api/school-center/productAPI"
import {cloneObject} from '@/utils/util'; import {cloneObject} from '@/utils/util';
import {getSchoolNames, initSubstName} from "../../../api/school-center/louZhang/louZhangManagerAPI";
export default { export default {
name: "university", name: "university",
components: { components: {
...@@ -112,6 +120,8 @@ ...@@ -112,6 +120,8 @@
Formtable: this.$form.createForm(this), Formtable: this.$form.createForm(this),
modifyvisible: false, modifyvisible: false,
add: true, add: true,
subNames: [],
schoolNames: [],
queryParam: { queryParam: {
universityName :'', //学校 universityName :'', //学校
universityRegion :'', // 区域 universityRegion :'', // 区域
...@@ -291,7 +301,43 @@ ...@@ -291,7 +301,43 @@
"speed":'', "speed":'',
"publicNumber":'' "publicNumber":''
}) })
},
getSchoolNames() {
this.schoolNames = []
this.queryParam.universityRegion = ''
getSchoolNames({"substName": this.queryParam.universityName}).then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.schoolName === 'null')
return;
this.schoolNames.push({
value: r.schoolName,
text: r.schoolName
})
})
}
})
},
initSubstName() {
initSubstName().then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.subName === 'null')
return;
this.subNames.push({
value: r.subName,
text: r.subName
})
})
} }
})
}
},
mounted() {
this.initSubstName();
this.getSchoolNames();
} }
} }
</script> </script>
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="网点名称:"> <a-form-item label="网点名称:">
<a-input placeholder="网点名称" v-model="queryParam.networkName"></a-input> <a-input placeholder="网点名称" v-model="queryParam.networkName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.subName" @change="getSchoolNames" style="width: 8rem;"> <a-select v-model="queryParam.subName" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
</a-col> </a-col>
<a-col :md="5" :sm="10"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.schoolName" style="width: 15rem;"> <a-select v-model="queryParam.schoolName">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="老客户升级页面 "> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="老客户升级页面 ">
<a-select placeholder="请选择" v-model="queryParam.status"> <a-select placeholder="请选择" v-model="queryParam.status">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="4"> <a-col :md="4" :sm="8">
<a-form-item label="放号人"> <a-form-item label="放号人">
<a-input placeholder="" v-model="queryParam.name"></a-input> <a-input placeholder="" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<a-input placeholder="" v-model="queryParam.account"></a-input> <a-input placeholder="" v-model="queryParam.account"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="4"> <a-col :md="3" :sm="6">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.salesSubst" @change="getSchoolNames"> <a-select v-model="queryParam.salesSubst" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
...@@ -24,16 +24,16 @@ ...@@ -24,16 +24,16 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.salesSchool" style="width: 15rem;"> <a-select v-model="queryParam.salesSchool">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="职位"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="职位">
<a-select placeholder="--全部--" v-model="queryParam.position"> <a-select placeholder="--全部--" v-model="queryParam.position">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
......
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="4"> <a-col :md="4" :sm="8">
<a-form-item label="放号人"> <a-form-item label="放号人">
<a-input placeholder="" v-model="queryParam.name"></a-input> <a-input placeholder="" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="10"> <a-col :md="4" :sm="8">
<a-form-item label="放号账号"> <a-form-item label="放号账号">
<a-input placeholder="" v-model="queryParam.account"></a-input> <a-input placeholder="" v-model="queryParam.account"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="2"> <a-col :md="3" :sm="6">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.salesSubst" @change="getSchoolNames"> <a-select v-model="queryParam.salesSubst" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
...@@ -24,16 +24,16 @@ ...@@ -24,16 +24,16 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="12"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.salesSchool" style="width: 15rem;"> <a-select v-model="queryParam.salesSchool">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="职位"> <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}" label="职位">
<a-select placeholder="--全部--" v-model="queryParam.position"> <a-select placeholder="--全部--" v-model="queryParam.position">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
......
...@@ -7,22 +7,22 @@ ...@@ -7,22 +7,22 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="用户姓名"> <a-form-item label="用户姓名">
<a-input placeholder="用户姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input> <a-input placeholder="用户姓名" v-model="queryParam.userName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="办理号码"> <a-form-item label="办理号码">
<a-input placeholder="办理号码" v-model="queryParam.orderPhone" style="width: 8rem;"></a-input> <a-input placeholder="办理号码" v-model="queryParam.orderPhone"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="联系号码"> <a-form-item label="联系号码">
<a-input placeholder="联系号码" v-model="queryParam.linkPhone" style="width: 8rem;"></a-input> <a-input placeholder="联系号码" v-model="queryParam.linkPhone"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item label="是否审核通过"> <a-form-item label="是否审核通过">
<a-select v-model="queryParam.auditState" style="width: 8rem;"> <a-select v-model="queryParam.auditState">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option key="1">未审核</a-select-option> <a-select-option key="1">未审核</a-select-option>
<a-select-option key="2"></a-select-option> <a-select-option key="2"></a-select-option>
...@@ -31,17 +31,17 @@ ...@@ -31,17 +31,17 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="6" :sm="12">
<a-form-item label="审核人">
<a-input placeholder="审核人" v-model="queryParam.auditName" style="width: 8rem;"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="10">
<a-form-item label="上传资料时间"> <a-form-item label="上传资料时间">
<a-range-picker @change="onChange" v-model="queryParam.uploadDate"/> <a-range-picker @change="onChange" v-model="queryParam.uploadDate"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="10"> <a-col :md="4" :sm="8">
<a-form-item label="审核人">
<a-input placeholder="审核人" v-model="queryParam.auditName"></a-input>
</a-form-item>
</a-col>
<a-col :md="5" :sm="10">
<a-form-item label="审核时间"> <a-form-item label="审核时间">
<a-range-picker @change="onChange1" v-model="queryParam.auditDate"/> <a-range-picker @change="onChange1" v-model="queryParam.auditDate"/>
</a-form-item> </a-form-item>
......
...@@ -7,22 +7,22 @@ ...@@ -7,22 +7,22 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="用户姓名"> <a-form-item label="用户姓名">
<a-input placeholder="用户姓名" v-model="queryParam.userName" style="width: 8rem;"></a-input> <a-input placeholder="用户姓名" v-model="queryParam.userName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="办理号码"> <a-form-item label="办理号码">
<a-input placeholder="办理号码" v-model="queryParam.orderPhone" style="width: 8rem;"></a-input> <a-input placeholder="办理号码" v-model="queryParam.orderPhone"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="4" :sm="8">
<a-form-item label="联系号码"> <a-form-item label="联系号码">
<a-input placeholder="联系号码" v-model="queryParam.linkPhone" style="width: 8rem;"></a-input> <a-input placeholder="联系号码" v-model="queryParam.linkPhone"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="3" :sm="6">
<a-form-item label="是否审核通过"> <a-form-item label="是否审核通过">
<a-select v-model="queryParam.auditState" style="width: 8rem;"> <a-select v-model="queryParam.auditState">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option key="1">未审核</a-select-option> <a-select-option key="1">未审核</a-select-option>
<a-select-option key="2"></a-select-option> <a-select-option key="2"></a-select-option>
...@@ -31,17 +31,17 @@ ...@@ -31,17 +31,17 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="6" :sm="12">
<a-form-item label="审核人">
<a-input placeholder="审核人" v-model="queryParam.auditName" style="width: 8rem;"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="10">
<a-form-item label="上传资料时间"> <a-form-item label="上传资料时间">
<a-range-picker @change="onChange" v-model="queryParam.uploadDate"/> <a-range-picker @change="onChange" v-model="queryParam.uploadDate"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="10"> <a-col :md="4" :sm="8">
<a-form-item label="审核人">
<a-input placeholder="审核人" v-model="queryParam.auditName"></a-input>
</a-form-item>
</a-col>
<a-col :md="5" :sm="10">
<a-form-item label="审核时间"> <a-form-item label="审核时间">
<a-range-picker @change="onChange1" v-model="queryParam.auditDate"/> <a-range-picker @change="onChange1" v-model="queryParam.auditDate"/>
</a-form-item> </a-form-item>
......
...@@ -5,51 +5,43 @@ ...@@ -5,51 +5,43 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name"></a-input> <a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item label="账号"> <a-form-item label="账号">
<a-input placeholder="账号" v-model="queryParam.account"></a-input> <a-input placeholder="账号" v-model="queryParam.account"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="16"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="县分"> <a-form-item label="县分">
<a-select placeholder="请选择" @change="changeSubst(3)" v-model="queryParam.substName" > <a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-select-option key="">请选择</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="data in substList" :value="data"> <a-select-option v-for="d in subNames" :key="d.value" :value="d.value">{{d.text}}</a-select-option>
{{ data}}
</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="10">
<a-col :md="6" :sm="12"> <a-form-item label="学校">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="学校名称"> <a-select v-model="queryParam.school" style="width: 15rem;">
<a-select showSearch placeholder="请选择" v-model="queryParam.school" > <a-select-option key="">--全部--</a-select-option>
<a-select-option key="">请选择</a-select-option> <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}</a-select-option>
<a-select-option v-for="data in schoolListParam" :value="data.id">
{{data.school_name}}
</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="6">
<a-col :md="5" :sm="16">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="角色"> <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="角色">
<a-select placeholder="请选择" @change="changeSubst" v-model="queryParam.roleid" > <a-select placeholder="请选择" @change="changeSubst" v-model="queryParam.roleid" >
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
<a-select-option v-for="data in roleList" :value="data.id"> <a-select-option v-for="data in roleList" :value="data.id">{{ data.name}}</a-select-option>
{{ data.name}}
</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="3" :sm="6">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="活跃状态"> <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="活跃状态">
<a-select showSearch placeholder="请选择" v-model="queryParam.isActive" > <a-select showSearch placeholder="请选择" v-model="queryParam.isActive" >
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -59,7 +51,7 @@ ...@@ -59,7 +51,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="12"> <a-col :md="3" :sm="6">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="状态"> <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="状态">
<a-select showSearch placeholder="请选择" v-model="queryParam.status" > <a-select showSearch placeholder="请选择" v-model="queryParam.status" >
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -69,7 +61,7 @@ ...@@ -69,7 +61,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="12"> <a-col :md="4" :sm="8">
<a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="身份上传状态"> <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="身份上传状态">
<a-select showSearch placeholder="请选择" v-model="queryParam.isUpload" > <a-select showSearch placeholder="请选择" v-model="queryParam.isUpload" >
<a-select-option key="">请选择</a-select-option> <a-select-option key="">请选择</a-select-option>
...@@ -298,7 +290,7 @@ ...@@ -298,7 +290,7 @@
findByList,modify,getlistysm,getRoleList, findByList,modify,getlistysm,getRoleList,
addPartner,getSubstList,getSchoolList,getXzUserList, addPartner,getSubstList,getSchoolList,getXzUserList,
exportUserList,deleteUser exportUserList,deleteUser
} from "@/api/school-center/PartnerManagementAPI" } from "../../../api/school-center/PartnerManagementAPI"
import {cloneObject,exportFile} from '@/utils/util' import {cloneObject,exportFile} from '@/utils/util'
import treecheck from '@/components/sysmanage/treeCheck' import treecheck from '@/components/sysmanage/treeCheck'
import treeList from '@/components/sysmanage/treeList' import treeList from '@/components/sysmanage/treeList'
...@@ -306,6 +298,7 @@ ...@@ -306,6 +298,7 @@
tabList, tabList,
userRoleTreeList, userRoleTreeList,
} from '@/api/system'; } from '@/api/system';
import {getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI";
export default { export default {
name: "PartnerManagement", name: "PartnerManagement",
...@@ -370,6 +363,8 @@ ...@@ -370,6 +363,8 @@
autoCompleteResult:[], autoCompleteResult:[],
subNameList: [], subNameList: [],
substList: [], substList: [],
schoolNames: [],
subNames: [],
roleList: [], roleList: [],
schoolList:[], schoolList:[],
schoolListParam: [], schoolListParam: [],
...@@ -403,17 +398,6 @@ ...@@ -403,17 +398,6 @@
//表示 //表示
let obj = cloneObject(this.queryParam) let obj = cloneObject(this.queryParam)
this.substList = [];
this.subNameList = [];
// 获取县分下拉清单
getSubstList(Object.assign(params,obj)).then(res => {
if (res.state == 'success') {
res.data.forEach((key)=>{
this.subNameList.push(key.sub_name)
this.substList.push(key.sub_name)
})
}
})
// 获取角色下拉清单 // 获取角色下拉清单
this.roleList = []; this.roleList = [];
...@@ -806,10 +790,44 @@ ...@@ -806,10 +790,44 @@
this.$message.info("删除失败",2); this.$message.info("删除失败",2);
} }
}) })
},
getSchoolNames() {
this.queryParam.school = ''
this.schoolNames = []
getSchoolNames({"substName": this.queryParam.substName}).then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.schoolName === 'null')
return;
this.schoolNames.push({
value: r.id,
text: r.schoolName
})
})
} }
})
},
initSubstName() {
initSubstName().then((res) => {
if (res.state == "success") {
const result = res.data
result.forEach((r) => {
if (r.subName === 'null')
return;
this.subNames.push({
value: r.subName,
text: r.subName
})
})
}
})
}
},
mounted() {
this.initSubstName();
this.getSchoolNames();
} }
} }
</script> </script>
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
</a-col> </a-col>
<a-col :md="3" :sm="6"> <a-col :md="3" :sm="6">
<a-form-item label="姓名"> <a-form-item label="姓名">
<a-input placeholder="姓名" v-model="queryParam.name" style="width: 8rem;"></a-input> <a-input placeholder="姓名" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="4"> <a-col :md="4" :sm="8">
<a-form-item label="县分"> <a-form-item label="县分">
<a-select v-model="queryParam.substName" @change="getSchoolNames"> <a-select v-model="queryParam.substName" @change="getSchoolNames">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</a-col> </a-col>
<a-col :md="5" :sm="10"> <a-col :md="5" :sm="10">
<a-form-item label="学校"> <a-form-item label="学校">
<a-select v-model="queryParam.schoolName" style="width: 15rem;"> <a-select v-model="queryParam.schoolName">
<a-select-option key="">--全部--</a-select-option> <a-select-option key="">--全部--</a-select-option>
<a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}} <a-select-option v-for="d in schoolNames" :key="d.value" :value="d.value">{{d.text}}
</a-select-option> </a-select-option>
......
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