Browse Source

新需求

lilei 4 years ago
parent
commit
feab561ab7

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

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 43 - 57
src/views/releaseRecord/releaseRecordList.vue

@@ -53,9 +53,7 @@
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption"
-                @focus="handleFocus"
-                @blur="handleBlur"
-                @change="handleChange">
+              >
                 <a-select-option v-for="item in optionData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
@@ -73,9 +71,9 @@
               </div>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row :gutter="20">
-
+          <a-col :span="4">
+            <a-button class="export-btn" id="releaseRecordList-export" @click="handleExport">导出</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -231,57 +229,46 @@ export default {
         this.queryParam.endDate = dateStrings[1]
       }
     },
-    handleChange (value) {
-      console.log(`selected ${value}`)
-    },
-    handleBlur () {
-      console.log('blur')
-    },
-    handleFocus () {
-      console.log('focus')
-    },
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
+    },
+    // 导出
+    handleExport () {
+
     },
     // 查询
     refresh () {
-      // const isONull = this.queryParam.goldNumStart === null
-      // const isOEmpty = this.queryParam.goldNumStart === ''
-      // const isOZero = this.queryParam.goldNumStart === 0
       const isTNull = this.queryParam.goldNumEnd === null
       const isTEmpty = this.queryParam.goldNumEnd === ''
-	  const isRNull = this.queryParam.rubbishWeightEnd === null
-	  const isREmpty = this.queryParam.rubbishWeightEnd === ''
-      // const isTZero = this.queryParam.goldNumEnd === 0
-      //    //  第一个为空(可为null可为空字符)第二个不为空
-      //    //  第一个不为空第二个为空(可为null可为空字符)
-      //    //  第一个大于第二个
-	  if ((this.queryParam.goldNumStart > this.queryParam.goldNumEnd) && !(isTNull || isTEmpty)) {
-	    this.$message.error('请输入正确的查询范围!')
-	    return
-	  }
-	  if ((this.queryParam.rubbishWeightStart > this.queryParam.rubbishWeightEnd) && !(isRNull || isREmpty)) {
-	    this.$message.error('请输入正确的查询范围!')
-	    return
-	  }
-	  this.queryParam.goldNumStart = this.queryParam.goldNumStart > 999999999 ? 999999999 : this.queryParam.goldNumStart
-	  this.queryParam.goldNumEnd = this.queryParam.goldNumEnd > 999999999 ? 999999999 : this.queryParam.goldNumEnd
-	  this.queryParam.rubbishWeightStart = this.queryParam.rubbishWeightStart > 999999999 ? 999999999 : this.queryParam.rubbishWeightStart
-	  this.queryParam.rubbishWeightEnd = this.queryParam.rubbishWeightEnd > 999999999 ? 999999999 : this.queryParam.rubbishWeightEnd
-	  this.$refs.table.refresh(true)
+      const isRNull = this.queryParam.rubbishWeightEnd === null
+      const isREmpty = this.queryParam.rubbishWeightEnd === ''
+      //  第一个为空(可为null可为空字符)第二个不为空
+      //  第一个不为空第二个为空(可为null可为空字符)
+      //  第一个大于第二个
+      if ((this.queryParam.goldNumStart > this.queryParam.goldNumEnd) && !(isTNull || isTEmpty)) {
+        this.$message.error('请输入正确的查询范围!')
+        return
+      }
+      if ((this.queryParam.rubbishWeightStart > this.queryParam.rubbishWeightEnd) && !(isRNull || isREmpty)) {
+        this.$message.error('请输入正确的查询范围!')
+        return
+      }
+      this.queryParam.goldNumStart = this.queryParam.goldNumStart > 999999999 ? 999999999 : this.queryParam.goldNumStart
+      this.queryParam.goldNumEnd = this.queryParam.goldNumEnd > 999999999 ? 999999999 : this.queryParam.goldNumEnd
+      this.queryParam.rubbishWeightStart = this.queryParam.rubbishWeightStart > 999999999 ? 999999999 : this.queryParam.rubbishWeightStart
+      this.queryParam.rubbishWeightEnd = this.queryParam.rubbishWeightEnd > 999999999 ? 999999999 : this.queryParam.rubbishWeightEnd
+      this.$refs.table.refresh(true)
     },
     // 获取合作商数据
     getStationList () {
-		  stationList().then(res => {
-			  console.log(res, '-----合作商')
-			  if (res.status == 200) {
-				  this.optionData = res.data || []
-			  }
-		  })
+      stationList().then(res => {
+        if (res.status == 200) {
+          this.optionData = res.data || []
+        }
+      })
     },
-
     // 合计
     getListTotal () {
       const params = {
@@ -310,28 +297,27 @@ export default {
             this.orderTotal = res.data.totalNum || 0
             this.amountTotal = res.data.goldNum || 0
           } else {
-			  this.orderTotal = 0
-			  this.amountTotal = 0
-		  }
+            this.orderTotal = 0
+            this.amountTotal = 0
+          }
         }
       })
     },
     // 重置
     handleReset () {
-      // this.queryOrderDate = undefined
-	  this.queryOrderDate = [
-	    moment(getDate.getRecentday().starttime, this.dateFormat),
-	    moment(getDate.getRecentday().endtime, this.dateFormat)
-	  ],
+      this.queryOrderDate = [
+        moment(getDate.getRecentday().starttime, this.dateFormat),
+        moment(getDate.getRecentday().endtime, this.dateFormat)
+      ]
       this.queryParam.customerMobile = ''
       this.queryParam.srcDeviceCode = ''
       this.queryParam.stationNo = undefined
-	  this.queryParam.rubbishType = '' // 投放类型
-	  this.queryParam.goldNumStart = '' // 兑换最小值
-	  this.queryParam.goldNumEnd = '' // 兑换最大值
+      this.queryParam.rubbishType = '' // 投放类型
+      this.queryParam.goldNumStart = '' // 兑换最小值
+      this.queryParam.goldNumEnd = '' // 兑换最大值
       this.queryParam.rubbishWeightStart = ''// 投放重量最小值
-	  this.queryParam.rubbishWeightEnd = '' // 投放重量最大值
-	  this.queryParam.deliveryWay = '' // 投放方式
+      this.queryParam.rubbishWeightEnd = '' // 投放重量最大值
+      this.queryParam.deliveryWay = '' // 投放方式
       this.$refs.table.refresh(true)
     }
   }