zhangdan преди 4 години
родител
ревизия
e56cea21ce

+ 6 - 6
src/views/businessManage/ledouCollectRecord/ledouCollectRecord.vue

@@ -108,8 +108,8 @@ export default {
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
         if (this.queryOrderDate && this.queryOrderDate.length) {
-          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD 00:00"00')
+          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD 23:59:59')
         } else {
           searchData.beginDate = ''
           searchData.endDate = ''
@@ -164,8 +164,8 @@ export default {
     handleExport () {
       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')
+        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = ''
         params.endDate = ''
@@ -205,8 +205,8 @@ export default {
     getTotal () {
       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')
+        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = ''
         params.endDate = ''

+ 8 - 8
src/views/recoveryManage/riderOrderModal.vue

@@ -30,12 +30,12 @@
 
         <a-col :span="8" class="item-cont">
           <p class="item-label">预约时间:</p>
-          <p class="item-main">{{ pageInfo.RESERVE_DATE_BEGIN ? pageInfo.RESERVE_DATE_BEGIN : '' }} {{ pageInfo.RESERVE_DATE_END ? pageInfo.RESERVE_DATE_END : '' }}</p>
-          <p v-if="!pageInfo.RESERVE_DATE_BEGIN && !pageInfo.RESERVE_DATE_END">--</p>
+          <p class="item-main">{{pageInfo.reserveDateBegin.substring(0,10)}} {{pageInfo.reserveTimeTypeDictValue}}</p>
+          <p v-if="!pageInfo.reserveDateBegin && !pageInfo.reserveTimeTypeDictValue">--</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">服务时间:</p>
-          <p class="item-main">{{ pageInfo.FINISH_DATE ? pageInfo.FINISH_DATE : '--' }}</p>
+          <p class="item-main">{{ pageInfo.finishDate ? pageInfo.finishDate : '--' }}</p>
         </a-col>
       </a-row>
       <a-row :gutter="48" >
@@ -56,12 +56,12 @@
       <a-row :gutter="48" >
         <a-col :span="8" class="item-cont">
           <p class="item-label">联系人信息:</p>
-          <p class="item-main">{{ pageInfo.CONTACT_NAME ? pageInfo.CONTACT_NAME+'-' : '' }} {{ pageInfo. CONTACT_MOBILE ? pageInfo. CONTACT_MOBILE : '' }}</p>
-          <p class="item-main" v-if="!pageInfo.CONTACT_NAME && !pageInfo. CONTACT_MOBILE">--</p>
+          <p class="item-main">{{ pageInfo.contactName ? pageInfo.contactName+'-' : '' }} {{ pageInfo.contactMobile ? pageInfo.contactMobile : '' }}</p>
+          <p class="item-main" v-if="!pageInfo.contactName && !pageInfo. contactName">--</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">地址:</p>
-          <p class="item-main">{{ pageInfo.CONTACT_ADDRESS ? pageInfo.CONTACT_ADDRESS : '--' }}</p>
+          <p class="item-main">{{ pageInfo.contactAddress ? pageInfo.contactAddress : '' }}{{pageInfo.houseAddress ? pageInfo.houseAddress : ''}}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">门头照:</p>
@@ -73,9 +73,9 @@
           <p class="item-label">类型:</p>
           <p class="item-main">{{ pageInfo.addressTypeDictValue ? pageInfo.addressTypeDictValue : '--' }}</p>
         </a-col>
-        <a-col :span="8" class="item-cont">
+        <a-col :span="8" class="item-cont" v-if="pageInfo.orderStatus==CANCEL">
           <p class="item-label">取消原因:</p>
-          <p class="item-main">{{ pageInfo.CANCEL_REASON ? pageInfo.CANCEL_REASON : '--' }}</p>
+          <p class="item-main">{{ pageInfo.cencelReason ? pageInfo.cencelReason : '--' }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">图片:</p>

+ 1 - 1
src/views/recoveryManage/riderOrderRecord.vue

@@ -189,7 +189,7 @@ export default {
         if (res.status == 200) {
           if (res.data) {
             this.totalNum = res.data.orderCount || 0 // 总条数
-            this.weightTotal = (res.data.totalWeight / 1000).toFixed(3) / 1 || 0// 回收物总计
+            this.weightTotal = (res.data.totalAllWeight / 1000).toFixed(3) / 1 || 0// 回收物总计
             this.moneyTotal = res.data.originalAllAmount || 0 // 金额总计
           }
         }

+ 2 - 2
src/views/recoveryManage/riderRecoveryTotal.vue

@@ -82,8 +82,8 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { 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 } }],
+        { title: '回收重量(kg)', dataIndex: 'totalAlWeight', width: 50, align: 'center', sorter: true, customRender: (text) => { return (text / 1000).toFixed(3) / 1 || 0 } },
+        { title: '交易金额(元)', dataIndex: 'originalAlAmount', width: 100, align: 'center', sorter: true, customRender: (text) => { return text || 0 } }],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)