zhangdan 4 years ago
parent
commit
1f0d06e9fa

+ 6 - 0
src/config/router.config.js

@@ -265,6 +265,7 @@ export const asyncRouterMap = [{
 		  meta: {
 		    title: '乐豆明细',
 		    icon: 'profile'
+        // permission: 'M_allLdDetail'
 		  }
     },
     {
@@ -297,6 +298,7 @@ export const asyncRouterMap = [{
 	    meta: {
 	      title: '统计报表',
 	      icon: 'bar-chart'
+        // permission: 'M_statisticalReport'
 	    }
 	  },
 	  {
@@ -318,6 +320,7 @@ export const asyncRouterMap = [{
 	    meta: {
 	      title: '清运明细',
 	      icon: 'unordered-list'
+        // permission: 'M_cleanDetail_list'
 	    }
 	  },
 	  {
@@ -328,6 +331,7 @@ export const asyncRouterMap = [{
 	    meta: {
 	      title: '网点清运记录',
 	      icon: 'line-chart'
+        // permission: 'M_netWorkCleanRecord_list'
 	    }
 	  },
 	  {
@@ -338,6 +342,7 @@ export const asyncRouterMap = [{
 	    meta: {
 	      title: '待清运网点',
 	      icon: 'cluster'
+        // permission: 'M_notCleanNetwork_list'
 	    }
 	  }
 	  ]
@@ -485,6 +490,7 @@ export const asyncRouterMap = [{
 	  meta: {
 	    title: '电子秤管理',
 	    icon: 'dashboard'
+        // permission: 'M_electronicScale_list'
 	  }
     },
     {

+ 6 - 6
src/views/cleanManage/netWorkCleanRecord.vue

@@ -109,8 +109,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 23:59:59')
         } else {
           searchData.beginDate = null
           searchData.endDate = null
@@ -167,8 +167,8 @@ export default {
     getTotal () {
       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 23:59:59')
       } else {
         params.beginDate = null
         params.endDate = null
@@ -196,8 +196,8 @@ export default {
         endDate: null
       }
       this.time = [
-        moment(getDate.getRecentday().starttime, 'YYYY-MM-DD'),
-        moment(getDate.getRecentday().endtime, 'YYYY-MM-DD')
+        moment(getDate.getRecentday().starttime, 'YYYY-MM-DD 00:00:00'),
+        moment(getDate.getRecentday().endtime, 'YYYY-MM-DD 23:59:59')
       ]
       this.$refs.table.refresh(true)
     },

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

@@ -125,7 +125,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center' },
         { title: '设备状态', scopedSlots: { customRender: 'onlineFlag' }, width: 150, align: 'center' },
-		{ title: '设备类型', dataIndex:'deviceType', width: 150, align: 'center' },
+		{ title: '设备类型', dataIndex:'deviceTypeDictValue', width: 150, align: 'center' },
         { title: '箱体类型', scopedSlots: { customRender: 'type' }, width: 150, align: 'center' },
         { title: '工作状态', scopedSlots: { customRender: 'workStatus' }, width: 150, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center' }

+ 6 - 18
src/views/releaseRecord/releaseRecordList.vue

@@ -34,7 +34,7 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="8" :lg="4">
             <a-form-item label="设备类型" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <v-select code="DEVICE_TYPE_CODE" v-model="queryParam.deviceType" allowClear placeholder="请选择设备类型" id="releaseRecordList-deviceType"></v-select>
+              <v-select code="DEVICE_TYPE" v-model="queryParam.deviceType" allowClear placeholder="请选择设备类型" id="releaseRecordList-deviceType"></v-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -157,7 +157,7 @@ export default {
         customerMobile: '', //  用户手机
         srcDeviceCode: '', //  设备编号
         stationNo: undefined, // 网点名称
-        deviceType: '', // 投放类型
+        deviceType: '', // 设备类型
         deliveryWay: '', // 投放方式
         goldNumStart: null, // 兑换最小值
         goldNumEnd: null, // 兑换最大值
@@ -173,7 +173,7 @@ export default {
         { title: '投放时间', dataIndex: 'deliveryTime', width: 200, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
-        { title: '设备类型', dataIndex: 'deviceType', width: 200, align: 'center' },
+        { title: '设备类型', dataIndex: 'deviceTypeDictValue', width: 200, align: 'center' },
         { title: '用户账号', dataIndex: 'customerMobile', width: 200, align: 'center' },
         { title: '投放方式', dataIndex: 'deliveryWayDictValue', width: 200, align: 'center' },
         { title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
@@ -227,7 +227,7 @@ export default {
         customerMobile: '', //  用户手机
         srcDeviceCode: '', //  设备编号
         stationNo: undefined, // 网点名称
-        rubbishType: '', // 投放类型
+        deviceType: '', // 设备类型
         deliveryWay: '', // 投放方式
         goldNumStart: null, // 兑换最小值
         goldNumEnd: null, // 兑换最大值
@@ -324,19 +324,7 @@ export default {
     },
     // 合计
     getListTotal () {
-      const params = {
-        customerMobile: this.queryParam.customerMobile,
-        beginDate: this.queryParam.beginDate,
-        endDate: this.queryParam.endDate,
-        srcDeviceCode: this.queryParam.srcDeviceCode, //  设备编号
-        stationNo: this.queryParam.stationNo, // 网点名称
-        goldNumStart: this.queryParam.goldNumStart, // 兑换最小值
-        goldNumEnd: this.queryParam.goldNumEnd, // 兑换最大值
-        rubbishWeightStart: this.queryParam.rubbishWeightStart, // 投放重量最小值
-        rubbishWeightEnd: this.queryParam.rubbishWeightEnd,
-        rubbishType: this.queryParam.rubbishType, // 投放类型
-        deliveryWay: this.queryParam.deliveryWay // 投放方式
-      }
+	  const params = this.queryParam
       if (this.queryOrderDate && this.queryOrderDate.length) {
         params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
         params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
@@ -365,7 +353,7 @@ export default {
       this.queryParam.customerMobile = ''
       this.queryParam.srcDeviceCode = ''
       this.queryParam.stationNo = undefined
-      this.queryParam.rubbishType = '' // 投放类型
+      this.queryParam.deviceType = '' // 设备类型
       this.queryParam.goldNumStart = '' // 兑换最小值
       this.queryParam.goldNumEnd = '' // 兑换最大值
       this.queryParam.rubbishWeightStart = ''// 投放重量最小值