lilei 4 anni fa
parent
commit
79122a8a8a

+ 15 - 12
src/views/equipmentManage/network/network.vue

@@ -2,7 +2,7 @@
   <a-card :bordered="false" class="network-table-page-search-wrapper">
     <div class="network-searchForm">
       <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="48">
+        <a-row :gutter="20">
           <a-col :span="6">
             <a-form-item label="创建时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-range-picker
@@ -14,32 +14,35 @@
                 @change="onChange" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入网点名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
+
+          <a-col :span="4">
             <a-form-item prop="provinceCode" label="省:">
               <a-select v-model="queryParam.provinceCode" @change="getCityList" placeholder="请选择省">
                 <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item prop="cityCode" label="市:">
               <a-select v-model="queryParam.cityCode" @change="getAreaList" placeholder="请选择市">
                 <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item prop="districtCode" label="区:">
               <a-select v-model="queryParam.districtCode" 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-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-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入网点名称" />
+            </a-form-item>
+          </a-col>
           <a-col :span="6">
             <a-button class="handle-btn serach-btn" id="network-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
             <a-button class="handle-btn" type="" id="network-btn-reset" @click="handleReset">重置</a-button>
@@ -154,9 +157,9 @@ export default {
       networkNo: null, //  网点编号
       openDetailModal: false, //  网点信息详情
       openBindModal: false, //  绑定箱体设备
-      addrProvinceList: [],  //  省下拉
-      addrCityList: [],  //  市下拉
-      addrDistrictList: [],  //  区下拉
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [] //  区下拉
     }
   },
   methods: {

+ 10 - 12
src/views/userInfo/userManageList.vue

@@ -2,13 +2,13 @@
   <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
     <div class="shopOrder-searchForm">
       <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="refresh">
-        <a-row :gutter="48">
+        <a-row :gutter="20">
           <a-col :span="6">
             <a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input id="releaseRecordList-mobile" allowClear :maxLength="11" v-model="queryParam.mobile" placeholder="请输入用户手机" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item label="乐豆余额" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <div class="input-number">
                 <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :max="999999999" @change="onChange" />-
@@ -16,7 +16,7 @@
               </div>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="4">
             <a-form-item label="账户状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 v-model="queryParam.state"
@@ -28,20 +28,17 @@
           </a-col>
           <a-col :span="6">
             <a-button class="handle-btn serach-btn" id="releaseRecordList-btn-serach" type="primary" @click="refresh">查询</a-button>
+            <a-button
+              class="export-btn"
+              id="releaseRecordList-btn-export"
+              :loading="loading"
+              @click="handleExport"
+              v-hasPermission="'B_user_userManage_export'">导出</a-button>
             <a-button class="handle-btn" type="" id="releaseRecordList-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
     </div>
-    <div class="table-operator">
-      <a-button
-        class="export-btn"
-        id="releaseRecordList-btn-export"
-        type=""
-        :loading="loading"
-        @click="handleExport"
-        v-hasPermission="'B_user_userManage_export'">导出</a-button>
-    </div>
     <s-table
       ref="table"
       size="default"
@@ -332,6 +329,7 @@ export default {
 			background-color: #ff9900;
 			border-color: #ff9900;
 			color: #fff;
+      margin-right: 10px;
 		}
 
 		.export-btn.ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger),