zhangdan 4 lat temu
rodzic
commit
60297b3703

+ 109 - 0
src/api/recoveryManage.js

@@ -0,0 +1,109 @@
+import { axios } from '@/utils/request'
+
+// 获取骑手列表数据
+export const getRiderList = params => {
+  const url = `/userExt/query/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 改变权限状态接口
+export const updateEnableStatus = params => {
+  return axios({
+    url: `userExt/enable/${params.id}/${params.flag}`,
+    data: {},
+    method: 'get'
+  })
+}
+
+// // 删除用户接口
+// export const delectUserPower = params => {
+//   return axios({
+//     url: `sleler/user/delete/${params.id}`,
+//     data: {},
+//     method: 'get'
+//   })
+// }
+
+// 新增/编辑保存接口
+export const savRider = params => {
+  return axios({
+    url: 'userExt/save',
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 回收价格列表
+export const gePriceList = params => {
+  return axios({
+    url: 'rubbish/type/queryConvert',
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 保存价格
+export const savPrice = params => {
+  return axios({
+    url: 'rubbish/type/update',
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 获取订单详情列表
+export const getOrderList = params => {
+  const url = `/dto/reserve/queryOrderReservePage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+// 订单总计
+export const getOrderTotal = (params) => {
+  const url = `/dto/reserve/groupOrderReserve`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 获取订单统计列表
+export const getOrderTotalList = params => {
+  const url = `/dto/reserve/orderReserveGroupByUserExtPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+// 订单总计
+export const getOrderTotalNum = (params) => {
+  const url = `/dto/reserve/groupExtPage`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 编辑查详情
+// export const slelerDetails = (params) => {
+//   const url = `sleler/user/findById/${params.id}`
+//   return axios({
+//     url: url,
+//     data: params,
+//     method: 'get'
+//   })
+// }

+ 54 - 25
src/views/recoveryManage/recoveryPriceSet.vue

@@ -18,14 +18,14 @@
       :loading="loadingPage"
       bordered>
       <!-- 序号 -->
-      <template slot="no" slot-scope="text, record" >
-        <span>{{ record.index+1 }}</span>
+      <template slot="no">
+        <span>{{ }}</span>
       </template>
       <!-- 门店结算价 -->
-      <template slot="accountPrice" slot-scope="text, record" >
+      <template slot="advicePrice" slot-scope="text, record" >
         <a-input-number
           id="storeSettlementPrice-price"
-          :value="record.accountPrice"
+          :value="record.advicePrice"
           :precision="2"
           :min="0"
           :max="999"
@@ -39,7 +39,7 @@
         <div class="editable-row-operations">
           <span >
             <!-- <a @click="() => save(record.id, record.accountPrice)" style="margin-right: 8px;">保存</a> -->
-            <a-popconfirm title="确定要保存吗?" @confirm="() => save(record.id)">
+            <a-popconfirm title="确定要保存吗?" @confirm="() => save(record.id,record.advicePrice)">
               <a>保存</a>
             </a-popconfirm>
           </span>
@@ -54,42 +54,71 @@
 </template>
 
 <script>
+import { gePriceList, savPrice } from '@/api/recoveryManage.js'
 export default {
   data () {
     return {
       loadingPage: false, // 列表加载状态
-      // tabs: [{ name: '上门回收价格设置' }, { name: '工厂回收价格设置' }],
+      type: '',
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center', scopedSlots: { customRender: 'no' } },
-        { title: '回收类型', dataIndex: 'type', width: 100, align: 'center' },
+        { title: '回收类型', dataIndex: 'fatherName', width: 100, align: 'center' },
         { title: '回收名称', dataIndex: 'name', width: 100, align: 'center' },
-        { title: '回收价格(元/kg)', width: 100, align: 'center', scopedSlots: { customRender: 'accountPrice' } },
+        { title: '回收价格(元/kg)', dataIndex: 'advicePrice', width: 100, align: 'center', scopedSlots: { customRender: 'advicePrice' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }
       ],
       //  表格列表数据
-      loadData: [
-        { index: 0, type: '衣物类/其他', name: '衣物' },
-        { index: 1, type: '纸质类', name: '黄纸' },
-        { index: 2, type: '纸质类', name: '花纸' },
-        { index: 3, type: '纸质类', name: '书纸' },
-        { index: 4, type: '纸质类', name: '杂志' },
-        { index: 5, type: '纸质类', name: '报纸' },
-        { index: 6, type: '纸质类', name: '杂纸' },
-        { index: 7, type: '塑料类', name: '塑料筐(白)' },
-        { index: 8, type: '塑料类', name: '塑料筐(黑)' },
-        { index: 9, type: '塑料类', name: '亚克力板' },
-        { index: 10, type: '塑料类', name: '塑料瓶(透明)' },
-        { index: 11, type: '金属类', name: '铁(薄)' },
-        { index: 12, type: '金属类', name: '铁(厚)' },
-        { index: 13, type: '金属类', name: '不锈钢' }
-      ]
+      loadData: []
     }
   },
+  mounted () {
+    this.getListData()
+  },
   methods: {
     callback (key) {
-      console.log(key)
+      this.type = key
+      gePriceList({ adviceType: key }).then(res => {
+        if (res.status == 200) {
+          this.loadData = res.data
+        }
+      })
+      // this.save()
+      console.log(key, this.type)
+    },
+    getListData () {
+      gePriceList({ adviceType: '1' }).then(res => {
+        if (res.status == 200) {
+          this.loadData = res.data
+        }
+      })
+    },
+    // 改变回收价格
+    handleChange (value, id) {
+      const newData = [...this.loadData]
+      const target = newData.filter(item => id === item.id)[0]
+      console.log(target, '-----------')
+      if (target) {
+        target['advicePrice'] = value
+        this.loadData = newData
+      }
+    },
+    // 保存价格
+    save (id, advicePrice) {
+      savPrice({ adviceType: this.type ? this.type : 1, id: id, advicePrice: advicePrice }).then(res => {
+        if (res.status == 200) {
+          this.$message.success(res.message)
+          gePriceList({ adviceType: this.type ? this.type : 1 }).then(res => {
+            if (res.status == 200) {
+              this.loadData = res.data
+            }
+          })
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
     }
+
   }
 }
 </script>

+ 27 - 70
src/views/recoveryManage/riderModal.vue

@@ -15,10 +15,10 @@
               <a-input
                 placeholder="请输入骑手名称(最多30个字符)"
                 allowClear
-                id="userModal-name"
+                id="userModal-userName"
                 :maxLength="30"
-                v-decorator="['formData.name', {
-                  initialValue: formData.name,getValueFromEvent: $filterEmpty,
+                v-decorator="['formData.userName', {
+                  initialValue: formData.userName,getValueFromEvent: $filterEmpty,
                   rules: [{ required: true, message: '请输入骑手名称(最多30个字符)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
               />
             </a-form-item>
@@ -30,9 +30,9 @@
                 placeholder="请输入骑手电话"
                 allowClear
                 :maxLength="11"
-                id="userModal-phone"
-                v-decorator="['formData.phone', {
-                  initialValue: formData.phone,getValueFromEvent: $filterEmpty,
+                id="userModal-userMobile"
+                v-decorator="['formData.userMobile', {
+                  initialValue: formData.userMobile,getValueFromEvent: $filterEmpty,
                   rules: [{ required: true, message: '请输入骑手电话!' },{pattern:/^[1][0-9]{10}$/, message: '请输入正确的骑手电话!'}] }]"
               />
             </a-form-item>
@@ -79,17 +79,17 @@
         <a-row :gutter="30" type="flex">
           <a-col :span="10">
             <a-form-item label="服务半径" :label-col="{ span: 8 }" :wrapper-col="{ span: 14 }" >
-              <a-input
+              <!-- <a-input
                 v-decorator="[
-                  'formData.lng',
-                  { initialValue: formData.lng, getValueFromEvent: $filterEmpty, rules: [
+                  'formData.serviceRadius',
+                  { initialValue: formData.serviceRadius, getValueFromEvent: $filterEmpty, rules: [
                     { required: true, message: '请输入服务半径' },
                     { pattern: /^[1-9]\d*$/, message: '请输入正确的服务半径(大于0的正整数)' }
                   ] }
                 ]"
                 placeholder="请输入服务半径"
-                allowClear />
-              <span>KM</span>
+                allowClear /> -->
+              <span>3KM</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -109,7 +109,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getRoleList, saveUserPower } from '@/api/power-user.js'
+import { savRider } from '@/api/recoveryManage.js'
 export default {
   name: 'RiderModal',
   components: {
@@ -135,12 +135,11 @@ export default {
       form: this.$form.createForm(this, { name: 'miniForm' }),
       roleList: [],
       formData: {
-        roleNames: undefined, // 角色
-        name: '',
-        loginFlag: '', // 活动状态
-        phone: '',
-        sex: '',
-        remarks: ''
+        userName: '',
+        userMobile: '',
+        serviceRadius: '',
+        lat: '',
+        lng: ''
       }
 
     }
@@ -157,10 +156,10 @@ export default {
       this.form.validateFields((err, values) => {
         console.log(values, 'values222')
         if (!err) {
-          values.formData.roleNames = values.formData.roleNames.join(',')
-          console.log(values.formData, ' formData.type222222222')
-          console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
-          saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
+          // values.formData.roleNames = values.formData.roleNames.join(',')
+          // console.log(values.formData, ' formData.type222222222')
+          // console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
+          savRider(Object.assign({ id: this.data.id ? this.data.id : '', userId: this.data.userId ? this.data.userId : '' }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')
@@ -182,29 +181,13 @@ export default {
     clear () {
       this.form.resetFields()
       delete this.formData.id
-      this.formData.roleNames = []
-      this.formData.name = ''
-      this.formData.loginFlag = ''
-      this.formData.phone = ''
-      this.formData.sex = ''
-      this.formData.remarks = ''
-    },
-
-    // 获取角色列表接口
-    getRoleList () {
-      getRoleList().then(res => {
-        console.log(res, 'res--role')
-        if (res.status + '' === '200') {
-          this.roleList = res.data
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
+      delete this.formData.userId
+      this.formData.userName = ''
+      this.formData.userMobile = ''
+      this.formData.lat = ''
+      this.formData.lng = ''
+      this.formData.serviceRadius = ''
     }
-
-  },
-  mounted () {
-    this.getRoleList()
   },
   beforeCreate () {
     this.form = this.$form.createForm(this, { name: 'miniForm' })
@@ -219,32 +202,6 @@ export default {
           this.titleText = '编辑用户'
           this.formData = Object.assign({}, this.data)
           delete this.formData.no
-          let roleNames = this.formData.roleNames
-          console.log(roleNames, 'roleNames')
-          if (roleNames) {
-            roleNames = roleNames.split(',')
-            console.log(roleNames, 'roleNames22')
-            const arr = []
-            console.log(this.roleList, 'this.roleList')
-
-            roleNames.map(item => {
-              const row = this.roleList.find(a => {
-                return a.name == item
-              })
-              if (row) {
-                arr.push(row.id)
-              }
-            })
-
-            console.log(arr, 'arrs')
-            this.formData.roleNames = arr
-          } else {
-            this.formData.roleNames = []
-          }
-
-          this.formData.loginFlag = Number(this.formData.loginFlag)
-          // this.formData.sex = Number(this.formData.sex)
-          console.log(this.formData, 'this.formData')
         } else {
           this.titleText = '新增用户'
         }

+ 55 - 44
src/views/recoveryManage/riderOrderRecord.vue

@@ -23,17 +23,17 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6">
             <a-form-model-item label="单号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input allowClear v-model.trim="queryParam.queryWord" placeholder="请输入单号" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.OrderReserveDTO.orderReserveNo" placeholder="请输入单号" @pressEnter="$refs.table.refresh(true)"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" >
-            <a-form-model-item label="用户信息" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input allowClear v-model.trim="queryParam.queryWord" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
+            <a-form-model-item label="联系人信息" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+              <a-input allowClear v-model.trim="queryParam.OrderReserveDTO.UserphoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" >
             <a-form-model-item label="骑手信息" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input allowClear v-model.trim="queryParam.queryWord" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.OrderReserveDTO.phoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
             </a-form-model-item>
           </a-col>
 
@@ -41,7 +41,7 @@
         <a-row :gutter="24">
           <a-col :xs="24" :sm="12" :md="6" >
             <a-form-model-item label="状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
+              <v-select code="ORDER_RESERVE_STATUS" v-model="queryParam.OrderReserveDTO.orderStatus" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" >
@@ -63,9 +63,16 @@
       :data="loadData"
       bordered
     >
-      <template slot="stationName" slot-scope="text,record">
-        <div>{{ stationName }}</div>
-        <div>{{ stationName }}</div>
+      <template slot="contact" slot-scope="text,record">
+        <div>{{ record.contactName }}</div>
+        <div>{{ record.contactMobile }}</div>
+        <div v-if="!record.contactName && !record.contactMobile">--</div>
+      </template>
+
+      <template slot="rider" slot-scope="text,record">
+        <div>{{ record.name }}</div>
+        <div>{{ record.phone }}</div>
+        <div v-if="!record.name && !record.phone">--</div>
       </template>
       <!-- 查看详情 -->
       <template slot="detail" slot-scope="text, record">
@@ -84,7 +91,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { cleanRecordList, getCleanStationTotal } from '@/api/cleanManage.js'
+import { getOrderList, getOrderTotal } from '@/api/recoveryManage.js'
 import moment from 'moment'
 import riderOrderModal from './riderOrderModal.vue'
 export default {
@@ -101,9 +108,12 @@ export default {
       },
       // 查询参数
       queryParam: {
-        beginDate: null, // 开始时间
-        endDate: null, // 结束时间
-        queryWord: '' // 骑手信息
+        OrderReserveDTO: {
+          orderReserveNo: '', // 骑手信息
+          orderStatus: '', // 骑手信息
+          phoneOrName: '', // 骑手信息
+          UserphoneOrName: ''
+        }
       },
       totalNum: 0, // 总条数
       weightTotal: 0, // 回收物总计
@@ -114,25 +124,26 @@ export default {
       time: [],
       dateFormat: 'YYYY-MM-DD',
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '下单时间', dataIndex: '', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '单号', dataIndex: '', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '用户信息', dataIndex: '', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '骑手信息', dataIndex: 'stationName', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '回收重量(kg)', dataIndex: 'cleanTimes', width: 150, align: 'center', sorter: true },
-        { title: '交易金额(元)', dataIndex: 'cleanWeight', width: 150, align: 'center', sorter: true, customRender: (text) => { return text || 0 } },
-        { title: '状态', dataIndex: '', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '下单时间', dataIndex: 'createDate', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '单号', dataIndex: 'orderReserveNo', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '下单账号', dataIndex: 'mobile', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '联系人信息', dataIndex: 'contact', width: 180, align: 'center', scopedSlots: { customRender: 'contact' } },
+        { title: '骑手信息', dataIndex: 'rider', width: 200, align: 'center', scopedSlots: { customRender: 'rider' } },
+        { title: '回收重量(kg)', dataIndex: 'totalWeight', width: 150, align: 'center', customRender: (text) => { return (text / 1000).toFixed(3) / 1 || 0 } },
+        { title: '交易金额(元)', dataIndex: 'originalAmount', width: 150, align: 'center', customRender: (text) => { return text || 0 } },
+        { title: '状态', dataIndex: 'orderStatus', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '详情', width: 80, align: 'center', scopedSlots: { customRender: 'detail' } }],
       // 加载数据方法 必须为 Promise 对象
       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 00:00:00')
-          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
+          searchData.OrderReserveDTO.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+          searchData.OrderReserveDTO.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
         } else {
-          searchData.beginDate = null
-          searchData.endDate = null
+          searchData.OrderReserveDTO.beginDate = null
+          searchData.OrderReserveDTO.endDate = null
         }
-        return cleanRecordList(searchData).then(res => {
+        return getOrderList(searchData).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             for (let i = 0; i < res.data.list.length; i++) {
@@ -142,18 +153,13 @@ export default {
                 _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3) / 1
               }
             }
-            this.totalNum = res.data.count
+            this.getTotal()
             return res.data
-          } else {
-            this.totalNum = 0
           }
         })
       }
     }
   },
-  mounted () {
-    this.getTotal()
-  },
   methods: {
     // 不可选日期
     disabledDate (date, dateStrings) {
@@ -162,8 +168,8 @@ export default {
     // 创建时间change
     onChange (dates, dateStrings) {
       if ((dates, dateStrings)) {
-        this.queryParam.beginDate = dateStrings[0]
-        this.queryParam.endDate = dateStrings[1]
+        this.queryParam.OrderReserveDTO.beginDate = dateStrings[0]
+        this.queryParam.OrderReserveDTO.endDate = dateStrings[1]
       }
     },
     filterOption (input, option) {
@@ -175,19 +181,19 @@ export default {
     getTotal () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        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')
+        params.OrderReserveDTO.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+        params.OrderReserveDTO.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
       } else {
-        params.beginDate = null
-        params.endDate = null
+        params.OrderReserveDTO.beginDate = null
+        params.OrderReserveDTO.endDate = null
       }
-      getCleanStationTotal(params).then(res => {
+      getOrderTotal(params).then(res => {
         if (res.status == 200) {
-          if (res.data != 0 || null) {
-            this.weightTotal = (res.data.cleanWeight / 1000).toFixed(3) / 1
+          if (res.data) {
+            this.totalNum = res.data.orderCount || 0 // 总条数
+            this.weightTotal = (res.data.totalWeight / 1000).toFixed(3) / 1 // 回收物总计
+            this.moneyTotal = res.data.originalAmount || 0 // 金额总计
           }
-        } else {
-          this.weightTotal = 0
         }
       })
     },
@@ -204,9 +210,14 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        queryWord: '',
-        beginDate: null,
-        endDate: null
+        OrderReserveDTO: {
+          beginDate: null, // 开始时间
+          endDate: null, // 结束时间
+          orderReserveNo: '', // 骑手信息
+          orderStatus: '', // 骑手信息
+          phoneOrName: '', // 骑手信息
+          UserphoneOrName: ''
+        }
       }
       this.time = []
       this.refreshSearch()

+ 27 - 25
src/views/recoveryManage/riderRecoveryTotal.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="骑手信息" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input allowClear v-model.trim="queryParam.queryWord" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.OrderReserveDTO.phoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
@@ -35,7 +35,7 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">总计<span> {{ totalNum }} </span>条,回收重量 <span> {{ cleanWeightTotal }} </span>kg,交易金额 <span>{{ moneyTotal }}</span>元</div>
+      <div class="ftext" slot="message">总计<span> {{ totalNum }} </span>条,回收重量 <span> {{ weightTotal }} </span>kg,交易金额 <span>{{ moneyTotal }}</span>元</div>
     </a-alert>
     <!-- 列表 -->
     <s-table
@@ -46,8 +46,9 @@
       bordered
     >
       <template slot="stationName" slot-scope="text,record">
-        <div>{{ stationName }}</div>
-        <div>{{ stationName }}</div>
+        <div>{{ record.name }}</div>
+        <div>{{ record.phone }}</div>
+        <div v-if="!record.name && !record.phone">--</div>
       </template>
     </s-table>
   </a-card>
@@ -55,7 +56,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { cleanRecordList, getCleanStationTotal } from '@/api/cleanManage.js'
+import { getOrderTotalList, getOrderTotalNum } from '@/api/recoveryManage.js'
 import moment from 'moment'
 export default {
   components: { STable, VSelect },
@@ -71,9 +72,9 @@ export default {
       },
       // 查询参数
       queryParam: {
-        beginDate: null, // 开始时间
-        endDate: null, // 结束时间
-        queryWord: '' // 骑手信息
+        OrderReserveDTO: {
+          phoneOrName: '' // 骑手信息
+        }
       },
       totalNum: 0, // 总条数
       weightTotal: 0, // 回收物总计
@@ -82,20 +83,20 @@ export default {
       time: [],
       dateFormat: 'YYYY-MM-DD',
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '骑手信息', dataIndex: 'stationName', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '回收重量(kg)', dataIndex: 'cleanTimes', width: 50, align: 'center', sorter: true },
-        { title: '交易金额(元)', dataIndex: 'cleanWeight', width: 100, align: 'center', sorter: true, customRender: (text) => { return text || 0 } }],
+        { title: '骑手信息', dataIndex: 'stationName', width: 200, align: 'center', scopedSlots: { customRender: 'stationName' } },
+        { title: '回收重量(kg)', dataIndex: 'totalWeight', width: 50, align: 'center', sorter: true, customRender: (text) => { return (text / 1000).toFixed(3) / 1 || 0 } },
+        { title: '交易金额(元)', dataIndex: 'originalAmount', width: 100, align: 'center', sorter: true, customRender: (text) => { return text || 0 } }],
       // 加载数据方法 必须为 Promise 对象
       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 00:00:00')
-          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
+          searchData.OrderReserveDTO.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+          searchData.OrderReserveDTO.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
         } else {
-          searchData.beginDate = null
-          searchData.endDate = null
+          searchData.OrderReserveDTO.beginDate = null
+          searchData.OrderReserveDTO.endDate = null
         }
-        return cleanRecordList(searchData).then(res => {
+        return getOrderTotalList(searchData).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             for (let i = 0; i < res.data.list.length; i++) {
@@ -125,8 +126,8 @@ export default {
     // 创建时间change
     onChange (dates, dateStrings) {
       if ((dates, dateStrings)) {
-        this.queryParam.beginDate = dateStrings[0]
-        this.queryParam.endDate = dateStrings[1]
+        this.queryParam.OrderReserveDTO.beginDate = dateStrings[0]
+        this.queryParam.OrderReserveDTO.endDate = dateStrings[1]
       }
     },
     filterOption (input, option) {
@@ -138,16 +139,16 @@ export default {
     getTotal () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        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')
+        params.OrderReserveDTO.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
+        params.OrderReserveDTO.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = null
         params.endDate = null
       }
-      getCleanStationTotal(params).then(res => {
+      getOrderTotalNum(params).then(res => {
         if (res.status == 200) {
           if (res.data != 0 || null) {
-            this.weightTotal = (res.data.cleanWeight / 1000).toFixed(3) / 1
+            // this.weightTotal = (res.data.cleanWeight / 1000).toFixed(3) / 1
           }
         } else {
           this.weightTotal = 0
@@ -162,9 +163,10 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        queryWord: '',
-        beginDate: null,
-        endDate: null
+        OrderReserveDTO: {
+          phoneOrName: ''
+        }
+
       }
       this.time = []
       this.refreshSearch()

+ 15 - 55
src/views/recoveryManage/riderSet.vue

@@ -7,9 +7,9 @@
             <a-form-item label="骑手名称">
               <a-input
                 allowClear
-                v-model.trim="queryParam.name"
+                v-model.trim="queryParam.userName"
                 placeholder="请输入骑手名称"
-                id="userList-name"
+                id="userList-userName"
                 :maxLength="30"
                 @pressEnter="$refs.table.refresh(true)" />
             </a-form-item>
@@ -19,10 +19,10 @@
             <a-form-item label="骑手电话">
               <a-input
                 allowClear
-                v-model.trim="queryParam.phone"
+                v-model.trim="queryParam.userMobile"
                 placeholder="请输入骑手电话"
                 :maxLength="11"
-                id="userList-phone"
+                id="userList-userMobile"
                 @pressEnter="$refs.table.refresh(true)" />
             </a-form-item>
           </a-col>
@@ -81,13 +81,11 @@ import {
 } from '@/components'
 import riderModal from './riderModal.vue'
 import {
-  resetPSD,
-  updateEnableStatus,
-  getPowerUserList,
-  delectUserPower
-} from '@/api/power-user.js'
+  getRiderList,
+  updateEnableStatus
+} from '@/api/recoveryManage.js'
 export default {
-  name: 'UserList',
+  name: 'RiderSet',
   components: {
     STable,
     VSelect,
@@ -97,8 +95,8 @@ export default {
     return {
       // 查询参数
       queryParam: {
-        name: '',
-        phone: ''
+        userName: '',
+        userMobile: ''
       },
       showModal: false,
       itemData: {}, // 编辑行数据
@@ -117,13 +115,13 @@ export default {
       },
       {
         title: '骑手名称',
-        dataIndex: 'name',
+        dataIndex: 'userName',
         width: 100,
         align: 'center'
       },
       {
         title: '骑手电话',
-        dataIndex: 'phone',
+        dataIndex: 'userMobile',
         width: 100,
         align: 'center'
       },
@@ -146,7 +144,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getPowerUserList(Object.assign(parameter, this.queryParam)).then(res => {
+        return getRiderList(Object.assign(parameter, this.queryParam)).then(res => {
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]
@@ -176,48 +174,10 @@ export default {
     },
     // 重置
     reset () {
-      this.queryParam.name = ''
-      this.queryParam.phone = '',
+      this.queryParam.userName = ''
+      this.queryParam.userMobile = '',
       this.refreshTable()
     },
-    // 重置密码
-    resetPassword (row) {
-      resetPSD({
-        id: row.id
-      }).then(res => {
-        if (res.status == 200) {
-          this.$message.success(res.message)
-        }
-      })
-    },
-    // 删除
-    delect (row) {
-      const _this = this
-      this.$confirm({
-        title: '警告',
-        centered: true,
-        content: '删除后无法恢复,确认删除?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          delectUserPower({
-            id: row.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$refs.table.refresh()
-            }
-          })
-        }
-      })
-    },
-    getBizStr (storeBizList) {
-      const str = []
-      storeBizList.forEach(item => {
-        str.push(item.bizTypeName)
-      })
-      return str.join(',')
-    },
     handleEdit (row) {
       console.log(row, 'row')
       this.showModal = true