Browse Source

Merge branch 'deploy_baobiao' of chelingzhu-web/zxyj-admin-html into master

lilei 4 năm trước cách đây
mục cha
commit
80c5e0d190

BIN
public/mark.png


+ 1 - 1
src/components/GlobalHeader/GlobalHeader.vue

@@ -2,7 +2,7 @@
   <transition name="showHeader">
     <div v-if="visible" class="header-animat">
       <a-layout-header
-        v-if="visible"
+        v-if="visible && $store.state.user.nowRouteName!='NodeMap'"
         :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
         :style="{ padding: '0' }">
         <div v-if="mode === 'sidemenu'" class="header">

+ 1 - 1
src/components/PageHeader/PageHeader.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page-header">
     <div class="page-header-index-wide">
-      <s-breadcrumb />
+      <s-breadcrumb v-if="$store.state.user.nowRouteName!='NodeMap'" />
       <div class="detail">
         <div class="main" v-if="!$route.meta.hiddenHeaderContent">
           <!-- <div class="row">

+ 58 - 32
src/layouts/BasicLayout.vue

@@ -7,16 +7,14 @@
       :wrapClassName="`drawer-sider ${navTheme}`"
       :closable="false"
       :visible="collapsed"
-      @close="drawerClose"
-    >
+      @close="drawerClose">
       <side-menu
         mode="inline"
         :menus="menus"
         :theme="navTheme"
         :collapsed="false"
         :collapsible="true"
-        @menuSelect="menuSelect"
-      ></side-menu>
+        @menuSelect="menuSelect"></side-menu>
     </a-drawer>
 
     <side-menu
@@ -25,8 +23,7 @@
       :menus="menus"
       :theme="navTheme"
       :collapsed="collapsed"
-      :collapsible="true"
-    ></side-menu>
+      :collapsible="true"></side-menu>
 
     <a-layout :class="[layoutMode, `content-width-${contentWidth}`]" :style="{ paddingLeft: contentPaddingLeft, minHeight: '100vh' }">
       <!-- layout header -->
@@ -36,8 +33,7 @@
         :theme="navTheme"
         :collapsed="collapsed"
         :device="device"
-        @toggle="toggle"
-      />
+        @toggle="toggle" />
 
       <!-- layout content -->
       <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '64px' : '0' }">
@@ -60,9 +56,17 @@
 </template>
 
 <script>
-import { triggerWindowResizeEvent } from '@/utils/util'
-import { mapState, mapActions } from 'vuex'
-import { mixin, mixinDevice } from '@/utils/mixin'
+import {
+  triggerWindowResizeEvent
+} from '@/utils/util'
+import {
+  mapState,
+  mapActions
+} from 'vuex'
+import {
+  mixin,
+  mixinDevice
+} from '@/utils/mixin'
 import config from '@/config/defaultSettings'
 
 import RouteView from './RouteView'
@@ -70,7 +74,9 @@ import SideMenu from '@/components/Menu/SideMenu'
 import GlobalHeader from '@/components/GlobalHeader'
 import GlobalFooter from '@/components/GlobalFooter'
 import SettingDrawer from '@/components/SettingDrawer'
-import { asyncRouterMap } from '@/config/router.config'
+import {
+  asyncRouterMap
+} from '@/config/router.config'
 
 export default {
   name: 'BasicLayout',
@@ -92,7 +98,8 @@ export default {
   computed: {
     ...mapState({
       // 动态主路由
-      mainMenu: state => state.permission.routers
+      mainMenu: state => state.permission.routers,
+      nowRouteName: state => state.user.nowRouteName
     }),
     contentPaddingLeft () {
       if (!this.fixSidebar || this.isMobile()) {
@@ -103,16 +110,30 @@ export default {
       }
       return '80px'
     }
+
   },
   watch: {
     sidebarOpened (val) {
-      this.collapsed = !val
+      // console.log(this.$store.state.user.nowRouteName, 'vvvvvvvvvvv')
+      if (this.$store.state.user.nowRouteName != 'NodeMap') {
+        this.collapsed = !val
+      } else {
+        this.collapsed = true
+	  }
+    },
+    nowRouteName (val) {
+      // console.log(val, 'vvvvvvvvvvv')
+      if (val == 'NodeMap') {
+        this.collapsed = true
+      } else {
+        this.collapsed = false
+      }
     }
   },
   created () {
-    if(this.mainMenu){
+    if (this.mainMenu) {
       this.menus = this.mainMenu.find((item) => item.path === '/').children
-    }else{
+    } else {
       // 没有权限时只显示首页
       const noqx = asyncRouterMap.find((item) => item.path === '/').children
       this.menus = [noqx.find(item => item.path === '/home')]
@@ -121,7 +142,8 @@ export default {
   },
   mounted () {
     const userAgent = navigator.userAgent
-    if (userAgent.indexOf('Edge') > -1) {
+    console.log(userAgent, this.collapsed, this.nowRouteName, 'this.collapsedthis.collapsedthis.collapsed')
+    if (userAgent.indexOf('Edge') > -1 && this.nowRouteName != 'NodeMap') {
       this.$nextTick(() => {
         this.collapsed = !this.collapsed
         setTimeout(() => {
@@ -129,6 +151,11 @@ export default {
         }, 16)
       })
     }
+    if (this.nowRouteName == 'NodeMap') {
+      this.$nextTick(() => {
+		  this.collapsed = true
+      })
+    }
   },
   methods: {
     ...mapActions(['setSidebar']),
@@ -146,8 +173,7 @@ export default {
       }
       return left
     },
-    menuSelect () {
-    },
+    menuSelect () {},
     drawerClose () {
       this.collapsed = false
     }
@@ -156,9 +182,9 @@ export default {
 </script>
 
 <style lang="less">
-@import url('../components/global.less');
+	@import url('../components/global.less');
 
-/*
+	/*
  * The following styles are auto-applied to elements with
  * transition="page-transition" when their visibility is toggled
  * by Vue.js.
@@ -167,17 +193,17 @@ export default {
  * these styles.
  */
 
-.page-transition-enter {
-  opacity: 0;
-}
+	.page-transition-enter {
+		opacity: 0;
+	}
 
-.page-transition-leave-active {
-  opacity: 0;
-}
+	.page-transition-leave-active {
+		opacity: 0;
+	}
 
-.page-transition-enter .page-transition-container,
-.page-transition-leave-active .page-transition-container {
-  -webkit-transform: scale(1.1);
-  transform: scale(1.1);
-}
+	.page-transition-enter .page-transition-container,
+	.page-transition-leave-active .page-transition-container {
+		-webkit-transform: scale(1.1);
+		transform: scale(1.1);
+	}
 </style>

+ 2 - 0
src/permission.js

@@ -14,6 +14,8 @@ const whiteList = ['login', 'register', 'registerResult'] // no redirect whiteli
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {
+	store.state.user.nowRouteName = to.name
+	console.log(to.name,store.state.user.nowRouteName,'router.beforeEach')
   NProgress.start() // start progress bar
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))
   let token = store.state.user.token || sessionStorage.getItem(ACCESS_TOKEN)

+ 6 - 2
src/store/modules/user.js

@@ -11,7 +11,8 @@ const user = {
     welcome: '',
     avatar: '',
     roles: { permissionList: [] },
-    info: {}
+    info: {},
+	nowRouteName: '' // 当前路由名称
   },
 
   mutations: {
@@ -35,7 +36,10 @@ const user = {
     },
     SET_MUSTCHANGEPWD: (state, status) => {
       state.mustChangePwd = status
-    }
+    },
+	SET_NOWROUTENAME: (state, name) => {
+	  state.nowRouteName = name
+	}
   },
 
   actions: {

+ 1 - 0
src/views/businessManage/leduQuery/leduQuery.vue

@@ -137,6 +137,7 @@ export default {
       // 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
       if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
+		return
       }
       this.loading = true
       exportOffPartnerGoldLog(params).then(res => {

+ 10 - 10
src/views/map/NodeMap.vue

@@ -47,7 +47,7 @@
           :sm="24"
           :md="24"
           :lg="24"
-          :xl="24"
+          :xl="16"
           :xxl="16">
           <div class="switper-cont">
             <div class="data-title">实时投递数据</div>
@@ -89,7 +89,7 @@
           :sm="24"
           :md="24"
           :lg="24"
-          :xl="24"
+          :xl="8"
           :xxl="8">
           <div class="switper-cont">
             <div class="data-title">实时新增用户</div>
@@ -169,8 +169,8 @@
               全市共有党政机关、企事业单位827个,职工人数16655人。其中,市级单位334个,秦都区297个,渭城区196个;居民小区1010个(两区居民小区994个,保障房小区16个),
               物业管理小区770个(两区754个,保障房小区16个)。其中,市本级保障房小区12个,物业管理小区12个。秦都区654个(含保障房小区3个),物业管理小区584个。渭城区
               344个(含保障房小区1个),物业管理174个(含保障房小区1个);学校(中小学、幼儿园)200所,其中,秦都区139所(中小学53所、幼儿园86所)。渭城区61所(中小
-              学27所、幼儿园34所)。截止目前,城区已建成试点单位67个, 设置智能分类
-              <span class="blue">{{ deviceTotal }}</span>组, 积分兑换亭<span class="blue">{{ sellerTotal }}</span>个, 无人兑换机<span
+              学27所、幼儿园34所)。截止目前,城区已建成试点单位67个, 设置智能收集
+              <span class="blue">{{ deviceTotal }}</span>组, 智能兑换亭<span class="blue">{{ sellerTotal }}</span>个, 智能兑换机<span
                 class="blue">{{ machineTotal }}</span>个, 覆盖28处办公场所的177个机关事业单位,居民小区29个,企业2个,学校8个。 软件注册人数<span class="blue">{{ userTotal }}</span>人,
               周回收有害垃圾5.646公斤、 可回收物9.26吨, 日处理厨余垃圾106吨。
             </div>
@@ -241,15 +241,15 @@ export default {
       equipmentPieColor: ['#ffaa00', '#00ff00', '#00aaff', '#ff55ff', '#1dc5d4', '#8465c7', '#00ffff'],
       // 设备数量统计对比图数据
       equipmentBarData: [{
-        name: '智能分类箱',
+        name: '智能收集箱',
         value: 0
       },
       {
-        name: '积分兑换亭',
+        name: '智能兑换亭',
         value: 0
       },
       {
-        name: '无人兑换机',
+        name: '智能兑换机',
         value: 0
       }
       ],
@@ -266,7 +266,7 @@ export default {
       }
     },
     mapHeight () {
-      return this.isMapFull ? '80vh' : '30vh'
+      return this.isMapFull ? '80vh' : '45vh'
     },
     classOption () {
       return {
@@ -315,8 +315,8 @@ export default {
         styles: {
           // 创建一个styleId为"myStyle"的样式(styles的子属性名即为styleId)
           'myStyle': new TMap.MarkerStyle({
-            'width': 25, // 点标记样式宽度(像素)
-            'height': 25, // 点标记样式高度(像素)
+            'width': 30, // 点标记样式宽度(像素)
+            'height': 30, // 点标记样式高度(像素)
             'src': '../mark.png', // 图片路径
             // 焦点在图片中的像素位置,一般大头针类似形式的图片以针尖位置做为焦点,圆形点以圆心位置为焦点
             'anchor': {

+ 1 - 0
src/views/releaseRecord/releaseRecordList.vue

@@ -253,6 +253,7 @@ export default {
       // 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
       if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
+        return
       }
       this.loading = true
       exportDeliveryLog(params).then(res => {

+ 13 - 7
src/views/reportForm/rubbishDeliverySearchTime.vue

@@ -96,7 +96,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '投递时间', dataIndex: 'putInDate', width: 100, align: 'center' },
+        { title: '投递时间', dataIndex: 'putInDate', width: 100, align: 'center', customRender: (text) => { return text + '时' } },
         { title: '可回收垃圾投递量(kg)',
           children: [
             { title: '废旧衣物', width: 100, align: 'center', dataIndex: 'clothesWeight', customRender: (text) => { return text || 0 } },
@@ -114,9 +114,12 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
+        if (searchData.stationNo) {
+          searchData.name = this.optionData.find(item => item.stationNo == searchData.stationNo).name || ''
+        }
         if (this.time && this.time.length) {
-          searchData.beginDate = moment(this.time[0])
-          searchData.endDate = moment(this.time[1])
+          searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD HH:00:00')
+          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD HH:00:00')
         } else {
           searchData.beginDate = ''
           searchData.endDate = ''
@@ -169,12 +172,15 @@ export default {
     handleExport () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        params.beginDate = moment(this.time[0])
-        params.endDate = moment(this.time[1])
+        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD HH:00:00')
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD HH:00:00')
       } else {
         params.beginDate = ''
         params.endDate = ''
       }
+	  if (params.stationNo) {
+	    params.name = this.optionData.find(item => item.stationNo == params.stationNo).name || ''
+	  }
       if (!params.beginDate && !params.endDate) {
         this.$message.error('请先选择需要导出的投放时间区间再进行导出!')
         return
@@ -233,8 +239,8 @@ export default {
         stationNo: this.queryParam.stationNo // 网点名称
       }
       if (this.time && this.time.length) {
-        params.beginDate = moment(this.time[0])
-        params.endDate = moment(this.time[1])
+        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD HH:00:00')
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD HH:00:00')
       } else {
         params.beginDate = ''
         params.endDate = ''

+ 27 - 9
src/views/reportForm/rubbishDeliveryTotal.vue

@@ -31,7 +31,7 @@
           </a-col>
           <a-col :span="5">
             <a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:0 }" :wrapper-col="{ span:20}">
-              <a-select allowClear id="rubbishTotal-districtCode" v-model="queryParam.districtCode" placeholder="请选择区/县">
+              <a-select allowClear id="rubbishTotal-districtCode" v-model="queryParam.districtCode" @change="getDistrictCode" placeholder="请选择区/县">
                 <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
@@ -47,6 +47,7 @@
                 v-model="queryParam.stationNo"
                 :showSearch="true"
                 option-filter-prop="children"
+                @change="stationNoChange"
                 :filter-option="filterOption">
                 <a-select-option v-for="item in optionData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
               </a-select>
@@ -123,10 +124,14 @@ export default {
       queryParam: {
         beginDate: null, // 开始时间
         endDate: null, // 结束时间
-        stationNo: undefined, // 网点名称
+        stationNo: undefined, // 网点no
+        name: '', // 网点名称
         provinceCode: undefined, //  省
+        provinceName: '',
         cityCode: undefined, // 市
-        districtCode: undefined // 区
+        cityName: '', // 市名称
+        districtCode: undefined, // 区
+        districtName: '' // 区名称
       },
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
@@ -232,8 +237,8 @@ export default {
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
         if (this.time && this.time.length) {
-          searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
-          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+          searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD 00:00:00')
         } else {
           searchData.beginDate = ''
           searchData.endDate = ''
@@ -297,8 +302,11 @@ export default {
     getCityList (val) {
       this.addrCityList = []
       this.addrDistrictList = []
+	  this.queryParam.provinceName = val ? this.addrProvinceList.find(item => item.code == this.queryParam.provinceCode).name : ''
       this.queryParam.cityCode = undefined
+      this.queryParam.cityName = ''
       this.queryParam.districtCode = undefined
+      this.queryParam.districtName = ''
       this.getCityListRequest(val)
     },
     getCityListRequest (val) {
@@ -315,7 +323,9 @@ export default {
     // 获取区县列表
     getAreaList (val) {
       this.addrDistrictList = []
+	  this.queryParam.cityName = val ? this.addrCityList.find(item => item.code == this.queryParam.cityCode).name : ''
       this.queryParam.districtCode = undefined
+	  this.queryParam.districtName = ''
       this.getAreaListRequest(val)
     },
     getAreaListRequest (val) {
@@ -329,12 +339,20 @@ export default {
         }
       })
     },
+    // 选择区
+    getDistrictCode (val) {
+      this.queryParam.districtName = val ? this.addrDistrictList.find(item => item.code == this.queryParam.districtCode).name : ''
+    },
+    // 选择网点
+    stationNoChange (val) {
+      this.queryParam.name = val ? this.optionData.find(item => item.stationNo == val).name : ''
+    },
     // 导出
     handleExport () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
-        params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD 00:00:00')
       } else {
         params.beginDate = ''
         params.endDate = ''
@@ -396,8 +414,8 @@ export default {
     getListTotal () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
-        params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD 00:00:00')
       } else {
         params.beginDate = ''
         params.endDate = ''

+ 1 - 0
src/views/shop/shopOrder.vue

@@ -181,6 +181,7 @@ export default {
       // 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
       if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
+		return
       }
       this.loading = true
       orderExport(params).then(res => {

+ 29 - 26
src/views/userInfo/userManageList.vue

@@ -1,10 +1,10 @@
 <template>
   <a-card :bordered="false" class="userManageList-table-page-search-wrapper">
     <div class="userManageList-searchForm">
-      <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="refresh">
+      <a-form-model :model="queryParam" ref="queryForm" layout="inline" v-bind="formItemLayout" @keyup.enter.native="refresh">
         <a-row :gutter="20">
           <a-col :span="6">
-            <a-form-item label="注册时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-model-item label="注册时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-range-picker
                 id="network-time"
                 v-model="registerTime"
@@ -12,10 +12,10 @@
                 :placeholder="['开始时间','结束时间']"
                 :disabledDate="disabledDate"
                 @change="onChangeregisterTime" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="最后投递时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-model-item label="最后投递时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-range-picker
                 id="network-time"
                 v-model="lastDeliverTime"
@@ -23,42 +23,49 @@
                 :placeholder="['开始时间','结束时间']"
                 :disabledDate="disabledDate"
                 @change="onChangelastDeliverTime" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-col :span="5">
+            <a-form-model-item prop="mobile" label="用户手机" :label-col="{span:8}" :wrapper-col="{span:16}">
               <a-input id="releaseRecordList-mobile" allowClear :maxLength="11" v-model="queryParam.mobile" placeholder="请输入用户手机" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="乐豆余额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+          <a-col :span="4">
+            <a-form-model-item label="乐豆余额" prop="currentGoldMin" :label-col="{span:10}" :wrapper-col="{span:14}">
               <div class="input-number">
-                <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :max="999999999" />-
-                <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :max="999999999" />
+                <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :max="999999999" />
+				<span style="margin-left: 22%;">-</span>
               </div>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
+		  <a-col :span="2">
+			  <a-form-model-item label=" " prop="currentGoldMax" :colon="false" :label-col="{span:1}" :wrapper-col="{span:23}">
+			    <div class="input-number">
+			      <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :max="999999999" />
+			    </div>
+			  </a-form-model-item>
+		  </a-col>
         </a-row>
         <a-row :gutter="20">
           <a-col :span="6">
-            <a-form-item label="账户状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-model-item label="账户状态" prop="state" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.state"
                 id="releaseRecordList-state"
                 code="ENABLE_FLAG"
                 placeholder="请选择账户状态"
                 allowClear></v-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="6">
-            <a-form-item label="用户身份" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-model-item prop="customerRole" label="用户身份" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.customerRole"
                 id="releaseRecordList-customerRole"
                 code="CUSTOMER_ROLE"
                 placeholder="请选择用户身份"
                 allowClear></v-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
           <a-col :span="6">
             <a-button class="handle-btn serach-btn" id="releaseRecordList-btn-serach" type="primary" @click="refresh">查询</a-button>
@@ -72,7 +79,7 @@
           </a-col>
         </a-row>
 
-      </a-form>
+      </a-form-model>
     </div>
     <s-table
       ref="table"
@@ -261,7 +268,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.queryParam = {}
+	  vm.$refs.queryForm.resetFields()
 	  vm.registerTime = []
 	  vm.lastDeliverTime = []
     })
@@ -286,10 +293,10 @@ export default {
       }
     },
     refresh () {
-      const isONull = this.queryParam.currentGoldMin === null
+      const isONull = this.queryParam.currentGoldMin === null || this.queryParam.currentGoldMin === undefined
       const isOEmpty = this.queryParam.currentGoldMin === ''
       const isOZero = this.queryParam.currentGoldMin === 0
-      const isTNull = this.queryParam.currentGoldMax === null
+      const isTNull = this.queryParam.currentGoldMax === null || this.queryParam.currentGoldMax === undefined
       const isTEmpty = this.queryParam.currentGoldMax === ''
       const isTZero = this.queryParam.currentGoldMax === 0
       //  第一个为空(可为null可为空字符)第二个不为空
@@ -345,11 +352,7 @@ export default {
     },
     // 重置
     handleReset () {
-      this.queryParam.mobile = '' //  用户手机
-      this.queryParam.currentGoldMin = '' // 乐豆余额最小值
-      this.queryParam.currentGoldMax = '' // 乐豆余额最大值
-      this.queryParam.state = '' // 账户状态
-      this.queryParam.customerRole = '' // 用户身份
+	  this.$refs.queryForm.resetFields()
       this.queryParam.beginDate = null // 最后投递时间的开始时间
       this.queryParam.endDate = null // 最后投递时间的结束时间
       this.queryParam.beginRegisterTime = null //  注册时间最小值