Browse Source

修复 1006724 bug单

zhangdan 4 years ago
parent
commit
cb28bc8708

+ 8 - 7
src/views/cleanManage/cleanDetail.vue

@@ -36,6 +36,7 @@
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="网点标签" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="cleanDetail-labelNoList"
                 placeholder="请选择网点标签"
                 mode="multiple"
@@ -127,8 +128,8 @@ export default {
         stationNo: undefined, // 网点编号
         srcDeviceCode: null, // 设备编号
         beginDate: null, // 开始时间
-        endDate: null ,// 结束时间
-        labelNoList:[]  // 网点标签
+        endDate: null, // 结束时间
+        labelNoList: [] // 网点标签
       },
       optionData: [], // 网点名称数据
       lableData: [], // 网点标签数据
@@ -200,14 +201,14 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-	// 获取标签数据
-	getlableSeleteList () {
+    // 获取标签数据
+    getlableSeleteList () {
 	  lableSeleteList().then(res => {
 	    if (res.status == 200) {
 	      this.lableData = res.data || []
 	    }
 	  })
-	},
+    },
     // 获取操作人数据
     getCleanUserList () {
       cleanUserList().then(res => {
@@ -264,8 +265,8 @@ export default {
         stationNo: undefined, // 网点编号
         srcDeviceCode: null, // 设备编号
         beginDate: null, // 开始时间
-        endDate: null ,// 结束时间
-        labelNoList:[]
+        endDate: null, // 结束时间
+        labelNoList: []
       }
       this.time = []
       this.refresh()

+ 1 - 0
src/views/cleanManage/netWorkCleanRecord.vue

@@ -38,6 +38,7 @@
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="网点标签" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="netWorkCleanRecord-labelNoList"
                 placeholder="请选择网点标签"
                 mode="multiple"

+ 1 - 0
src/views/equipmentManage/equipment/equipment.vue

@@ -58,6 +58,7 @@
           <a-col :span="6">
             <a-form-item label="网点标签">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="equipment-labelNoList"
                 placeholder="请选择网点标签"
                 mode="multiple"

+ 1 - 0
src/views/equipmentManage/network/network.vue

@@ -17,6 +17,7 @@
           <a-col :span="6">
             <a-form-item label="网点标签">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="network-labelNoList"
                 placeholder="请选择网点标签"
                 mode="multiple"

+ 11 - 10
src/views/releaseRecord/releaseRecordList.vue

@@ -4,7 +4,7 @@
       <a-form layout="inline" @keyup.enter.native="refresh">
         <a-row :gutter="24">
           <a-col :lg="6" :md="8" :xs="24" :sm="12">
-            <a-form-item label="投放时间:">
+            <a-form-item label="投放时间:" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-range-picker
                 style="width:100%"
                 id="releaseRecordList-queryOrderDate"
@@ -15,17 +15,17 @@
             </a-form-item>
           </a-col>
           <a-col :lg="5" :md="8" :xs="24" :sm="12">
-            <a-form-item label="用户账号">
+            <a-form-item label="用户账号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
             </a-form-item>
           </a-col>
           <a-col :lg="4" :md="8" :xs="24" :sm="12">
-            <a-form-item label="投放类型">
+            <a-form-item label="投放类型" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select code="RUBBISH_TYPE" v-model="queryParam.rubbishType" allowClear placeholder="请选择投放类型" id="releaseRecordList-rubbishType"></v-select>
             </a-form-item>
           </a-col>
           <a-col :lg="5" :md="8" :xs="24" :sm="12">
-            <a-form-item label="兑换乐豆">
+            <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.goldNumStart" :max="999999999" @change="onChange" />-
                 <a-input-number id="inputNumber" v-model="queryParam.goldNumEnd" :max="999999999" @change="onChange" />
@@ -33,19 +33,19 @@
             </a-form-item>
           </a-col>
           <a-col :lg="4" :md="8" :xs="24" :sm="12">
-            <a-form-item label="设备类型">
+            <a-form-item label="设备类型" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select code="DEVICE_TYPE" v-model="queryParam.deviceType" allowClear placeholder="请选择设备类型" id="releaseRecordList-deviceType"></v-select>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :lg="6" :md="8" :xs="24" :sm="12">
-            <a-form-item label="设备编号">
+            <a-form-item label="设备编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-input id="releaseRecordList-srcDeviceCode" allowClear :maxLength="120" v-model=" queryParam.srcDeviceCode " placeholder="请输入设备编号" />
             </a-form-item>
           </a-col>
           <a-col :lg="5" :md="8" :xs="24" :sm="12">
-            <a-form-item label="网点名称">
+            <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
                 id="releaseRecordList-stationNo"
                 placeholder="请选择网点名称"
@@ -60,7 +60,7 @@
             </a-form-item>
           </a-col>
           <a-col :lg="4" :md="8" :xs="24" :sm="12">
-            <a-form-item label="称重值">
+            <a-form-item label="称重值" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select
                 code="DEVICE_WEIGHT_TAG"
                 mode="multiple"
@@ -79,15 +79,16 @@
             </a-form-item>
           </a-col>
           <a-col :lg="4" :md="8" :xs="24" :sm="12">
-            <a-form-item label="投放方式">
+            <a-form-item label="投放方式" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <v-select code="DELIVERY_WAY" v-model="queryParam.deliveryWay" allowClear placeholder="请选择投放方式" id="releaseRecordList-deliveryWay"></v-select>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :lg="6" :md="8" :xs="24" :sm="12">
-            <a-form-item label="网点标签">
+            <a-form-item label="网点标签" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="releaseRecordList-labelNoList"
                 placeholder="请选择网点标签"
                 allowClear

+ 1 - 0
src/views/reportForm/rubbishDeliverySearchTime.vue

@@ -34,6 +34,7 @@
           <a-col :span="6">
             <a-form-item label="网点标签" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="releaseRecordList-labelNo"
                 placeholder="请选择网点标签"
                 mode="multiple"

+ 1 - 0
src/views/reportForm/rubbishDeliveryTotal.vue

@@ -56,6 +56,7 @@
           <a-col :span="6">
             <a-form-model-item label="网点标签" prop="stationNo" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="rubbishTotal-labelNo"
                 placeholder="请选择网点标签"
                 mode="multiple"

+ 1 - 0
src/views/userInfo/userManageList.vue

@@ -89,6 +89,7 @@
           <a-col :span="6">
             <a-form-item label="网点标签">
               <a-select
+                style="max-height: 50px;overflow: auto;margin-top: 3px;"
                 id="userManageList-labelNo"
                 placeholder="请选择网点标签"
                 mode="multiple"