Procházet zdrojové kódy

ID1006261 ID1006264 bug修复

zhangdan před 4 roky
rodič
revize
962ad8f4dd

+ 2 - 2
src/views/Service/PurchasedServiceDetail.vue

@@ -8,9 +8,9 @@
           <detail-list-item term="下单时间">{{ orderBundle.orderDate ? orderBundle.orderDate : '--' }}</detail-list-item>
           <detail-list-item term="下单时间">{{ orderBundle.orderDate ? orderBundle.orderDate : '--' }}</detail-list-item>
           <detail-list-item term="订单状态">{{ palyStatus ? palyStatus :'--' }}</detail-list-item>
           <detail-list-item term="订单状态">{{ palyStatus ? palyStatus :'--' }}</detail-list-item>
           <detail-list-item term="客户信息">{{ custInfo ? custInfo : '--' }}</detail-list-item>
           <detail-list-item term="客户信息">{{ custInfo ? custInfo : '--' }}</detail-list-item>
-          <detail-list-item term="应付金额">¥{{ orderBundle.totalAmount ? orderBundle.totalAmount :'--' }}</detail-list-item>
+          <detail-list-item term="应付金额">¥{{ orderBundle.totalAmount ? orderBundle.totalAmount :0 }}</detail-list-item>
           <detail-list-item term="支付时间" v-if="isPay">{{ payDate ? payDate : '--' }}</detail-list-item>
           <detail-list-item term="支付时间" v-if="isPay">{{ payDate ? payDate : '--' }}</detail-list-item>
-          <detail-list-item term="支付金额" v-if="isPay">¥{{ orderBundle.payedAmount ? orderBundle.payedAmount : '--' }}</detail-list-item>
+          <detail-list-item term="支付金额" v-if="isPay">¥{{ orderBundle.payedAmount ? orderBundle.payedAmount : 0 }}</detail-list-item>
         </detail-list>
         </detail-list>
       </a-card>
       </a-card>
       <a-card class="detail-card" :bordered="false" title="服务内容">
       <a-card class="detail-card" :bordered="false" title="服务内容">

+ 18 - 3
src/views/Service/PurchasedServiceList.vue

@@ -220,7 +220,7 @@ export default {
       },
       },
       {
       {
         title: '收款金额',
         title: '收款金额',
-        dataIndex: 'totalAmount',
+        dataIndex: 'payedAmount',
         width: 100,
         width: 100,
         align: 'center'
         align: 'center'
       },
       },
@@ -398,10 +398,25 @@ export default {
       link.click()
       link.click()
     }
     }
   },
   },
+  mounted () {
+    this.getSalesChannel()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.resetSearchForm()
-      vm.getSalesChannel()
+      vm.queryParam.beginDate = getDate.getRecentday().starttime
+      vm.queryParam.endDate = getDate.getRecentday().endtime
+      vm.queryOrderDate = [
+        moment(getDate.getRecentday().starttime, this.dateFormat),
+        moment(getDate.getRecentday().endtime, this.dateFormat)
+      ]
+      vm.queryParam = {
+        dataSourceNo: '',
+        custMobile: '',
+        bundleName: '',
+        dataSourceNo: undefined,
+        salesChannelSettleStatus: '',
+        freeChoiceFlag: 1
+      }
     })
     })
   }
   }
 }
 }

+ 3 - 3
src/views/SetmealSales/SetmealDetailModal.vue

@@ -43,7 +43,7 @@
       <a-row :gutter="20" v-if="detailsData">
       <a-row :gutter="20" v-if="detailsData">
         <a-col :span="8" class="item-cont">
         <a-col :span="8" class="item-cont">
           <p class="item-label">套餐价格:</p>
           <p class="item-label">套餐价格:</p>
-          <p class="item-main">{{ detailsData.orderBundle.totalAmount ? detailsData.orderBundle.totalAmount + '元' : '--' }}</p>
+          <p class="item-main">{{ detailsData.orderBundle.totalAmount ? detailsData.orderBundle.totalAmount + '元' : 0 }}</p>
         </a-col>
         </a-col>
         <a-col :span="8" class="item-cont">
         <a-col :span="8" class="item-cont">
           <p class="item-label">销售人员:</p>
           <p class="item-label">销售人员:</p>
@@ -51,7 +51,7 @@
         </a-col>
         </a-col>
         <a-col :span="8" class="item-cont">
         <a-col :span="8" class="item-cont">
           <p class="item-label">收款金额:</p>
           <p class="item-label">收款金额:</p>
-          <p class="item-main">{{ detailsData.orderBundle.payedAmount ? detailsData.orderBundle.payedAmount + '元' : '--' }}</p>
+          <p class="item-main">{{ detailsData.orderBundle.payedAmount ? detailsData.orderBundle.payedAmount + '元' : 0 }}</p>
         </a-col>
         </a-col>
       </a-row>
       </a-row>
       <a-row :gutter="20" v-if="detailsData">
       <a-row :gutter="20" v-if="detailsData">
@@ -170,7 +170,7 @@ export default {
           if (res.data && res.data.customerBundleItemList && res.data.customerBundleItemList.length > 0) {
           if (res.data && res.data.customerBundleItemList && res.data.customerBundleItemList.length > 0) {
             res.data.customerBundleItemList.map((item, index) => {
             res.data.customerBundleItemList.map((item, index) => {
               item.no = index + 1
               item.no = index + 1
-              item.isDelay = (item.expiryDate ? item.expiryDate.substr(0, 10) != '2099-01-01' : false) && (item.cycleFlag == 0) && (res.data.orderBundle.orderFlag != 'RUND')
+              item.isDelay = (item.expiryDate ? item.expiryDate.substr(0, 10) != '2099-01-01' : false) && (item.cycleFlag == 0)
             })
             })
             this.setMealData = res.data.customerBundleItemList
             this.setMealData = res.data.customerBundleItemList
           } else {
           } else {