zhangdan 4 年之前
父節點
當前提交
dfcf5c8c0c
共有 2 個文件被更改,包括 36 次插入45 次删除
  1. 24 28
      src/views/recoveryManage/riderOrderRecord.vue
  2. 12 17
      src/views/recoveryManage/riderRecoveryTotal.vue

+ 24 - 28
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.OrderReserveDTO.orderReserveNo" placeholder="请输入单号" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.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.OrderReserveDTO.UserphoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.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.OrderReserveDTO.phoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.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="ORDER_RESERVE_STATUS" v-model="queryParam.OrderReserveDTO.orderStatus" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
+              <v-select code="ORDER_RESERVE_STATUS" v-model="queryParam.orderStatus" allowClear placeholder="请选择状态" id="userList-check-enable-state"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" >
@@ -108,12 +108,10 @@ export default {
       },
       // 查询参数
       queryParam: {
-        OrderReserveDTO: {
-          orderReserveNo: '', // 骑手信息
-          orderStatus: '', // 骑手信息
-          phoneOrName: '', // 骑手信息
-          UserphoneOrName: ''
-        }
+        orderReserveNo: '', // 骑手信息
+        orderStatus: '', // 骑手信息
+        phoneOrName: '', // 骑手信息
+        UserphoneOrName: ''
       },
       totalNum: 0, // 总条数
       weightTotal: 0, // 回收物总计
@@ -137,11 +135,11 @@ export default {
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
         if (this.time && this.time.length) {
-          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')
+          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.OrderReserveDTO.beginDate = null
-          searchData.OrderReserveDTO.endDate = null
+          searchData.beginDate = null
+          searchData.endDate = null
         }
         return getOrderList(searchData).then(res => {
           if (res.status == 200) {
@@ -168,8 +166,8 @@ export default {
     // 创建时间change
     onChange (dates, dateStrings) {
       if ((dates, dateStrings)) {
-        this.queryParam.OrderReserveDTO.beginDate = dateStrings[0]
-        this.queryParam.OrderReserveDTO.endDate = dateStrings[1]
+        this.queryParam.beginDate = dateStrings[0]
+        this.queryParam.endDate = dateStrings[1]
       }
     },
     filterOption (input, option) {
@@ -181,11 +179,11 @@ export default {
     getTotal () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        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')
+        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.OrderReserveDTO.beginDate = null
-        params.OrderReserveDTO.endDate = null
+        params.beginDate = null
+        params.endDate = null
       }
       getOrderTotal(params).then(res => {
         if (res.status == 200) {
@@ -210,14 +208,12 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        OrderReserveDTO: {
-          beginDate: null, // 开始时间
-          endDate: null, // 结束时间
-          orderReserveNo: '', // 骑手信息
-          orderStatus: '', // 骑手信息
-          phoneOrName: '', // 骑手信息
-          UserphoneOrName: ''
-        }
+        beginDate: null, // 开始时间
+        endDate: null, // 结束时间
+        orderReserveNo: '', // 骑手信息
+        orderStatus: '', // 骑手信息
+        phoneOrName: '', // 骑手信息
+        UserphoneOrName: ''
       }
       this.time = []
       this.refreshSearch()

+ 12 - 17
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.OrderReserveDTO.phoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
+              <a-input allowClear v-model.trim="queryParam.phoneOrName" placeholder="请输入名称或电话" @pressEnter="$refs.table.refresh(true)"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
@@ -72,9 +72,7 @@ export default {
       },
       // 查询参数
       queryParam: {
-        OrderReserveDTO: {
-          phoneOrName: '' // 骑手信息
-        }
+        phoneOrName: '' // 骑手信息
       },
       totalNum: 0, // 总条数
       weightTotal: 0, // 回收物总计
@@ -90,11 +88,11 @@ export default {
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
         if (this.time && this.time.length) {
-          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')
+          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.OrderReserveDTO.beginDate = null
-          searchData.OrderReserveDTO.endDate = null
+          searchData.beginDate = null
+          searchData.endDate = null
         }
         return getOrderTotalList(searchData).then(res => {
           if (res.status == 200) {
@@ -126,8 +124,8 @@ export default {
     // 创建时间change
     onChange (dates, dateStrings) {
       if ((dates, dateStrings)) {
-        this.queryParam.OrderReserveDTO.beginDate = dateStrings[0]
-        this.queryParam.OrderReserveDTO.endDate = dateStrings[1]
+        this.queryParam.beginDate = dateStrings[0]
+        this.queryParam.endDate = dateStrings[1]
       }
     },
     filterOption (input, option) {
@@ -139,8 +137,8 @@ export default {
     getTotal () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        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')
+        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
@@ -149,7 +147,7 @@ export default {
         if (res.status == 200) {
           if (res.data != 0 || null) {
             this.weightTotal = (res.data.totalAllWeight / 1000).toFixed(3) / 1 || 0
-            this.moneyTotal=res.data.originalAllAmount || 0
+            this.moneyTotal = res.data.originalAllAmount || 0
           }
         } else {
           this.weightTotal = 0
@@ -164,10 +162,7 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        OrderReserveDTO: {
-          phoneOrName: ''
-        }
-
+        phoneOrName: ''
       }
       this.time = []
       this.refreshSearch()