From e34c10caa5b5cf623c66ef1e44f04b2a91500669 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 17 Jun 2021 09:09:47 +0800
Subject: [PATCH] no message

---
 components/calendar/calendar.wxml     | 10 ++++++++
 components/calendar/index.wxml        |  1 -
 pages/agent/appointment/index.js      |  2 --
 xtends/statics/index/index.js         | 11 +++++++-
 xtends/statics/sale-report/index.js   | 37 +++++++++++++++++++++------
 xtends/statics/sale-report/index.json |  2 ++
 xtends/statics/sale-report/index.wxml |  8 +++++-
 7 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/components/calendar/calendar.wxml b/components/calendar/calendar.wxml
index c807158..eedb8ec 100644
--- a/components/calendar/calendar.wxml
+++ b/components/calendar/calendar.wxml
@@ -11,6 +11,16 @@
       showMonthTitle="{{ index !== 0 || !showSubtitle }}" bind:click="onClickDay" />
   </scroll-view>
 
+  <!-- <swiper current="{{0}}" class="van-calendar__body">
+    <swiper-item wx:for="{{ computed.getMonths(minDate, maxDate) }}" wx:key="index">
+      <month id="month{{ index }}" class="month" data-date="{{ item }}" date="{{ item }}" type="{{ type }}"
+        color="{{ color }}" index="{{ index }}" minDate="{{ minDate }}" maxDate="{{ maxDate }}"
+        showMark="{{ showMark }}" formatter="{{ formatter }}" rowHeight="{{ rowHeight }}"
+        currentDate="{{ currentDate }}" showSubtitle="{{ showSubtitle }}" allowSameDay="{{ allowSameDay }}"
+        showMonthTitle="{{ index !== 0 || !showSubtitle }}" bind:click="onClickDay" />
+    </swiper-item>
+  </swiper> -->
+
   <view class="{{ utils.bem('calendar__footer', { safeAreaInsetBottom }) }}">
     <slot name="footer"></slot>
   </view>
diff --git a/components/calendar/index.wxml b/components/calendar/index.wxml
index 374f4f0..1621165 100644
--- a/components/calendar/index.wxml
+++ b/components/calendar/index.wxml
@@ -1,6 +1,5 @@
 <wxs src="./index.wxs" module="computed" />
 <wxs src="../wxs/utils.wxs" module="utils" />
-
 <import src="./calendar.wxml" />
 
 <van-popup wx:if="{{ poppable }}" custom-class="van-calendar__popup--{{ position }}"
diff --git a/pages/agent/appointment/index.js b/pages/agent/appointment/index.js
index 923f6b3..41bdf44 100644
--- a/pages/agent/appointment/index.js
+++ b/pages/agent/appointment/index.js
@@ -129,8 +129,6 @@ Scene({
   onEdit: function(e){
     this.setData({ editing: true })
   },
-  bindRemark: function (e) {
-  },
   bindInput: function (e) {
     if(!util.isEmpty(e.currentTarget.id)){
       var form_data = 'form.' + e.currentTarget.id
diff --git a/xtends/statics/index/index.js b/xtends/statics/index/index.js
index 99d6d4d..0c49d56 100644
--- a/xtends/statics/index/index.js
+++ b/xtends/statics/index/index.js
@@ -67,7 +67,16 @@ Scene({
   },
   showCalendar: function(e){
     this.data.selectId = e.currentTarget.id
-    this.setData({ show: true })
+    if(this.data.selectId == 'form1') {
+      var start = new Date(this.data.form1.dimensionDateStart + ' 00:00:00')
+      var end = new Date(this.data.form1.dimensionDateEnd + ' 00:00:00')
+      this.data.vdate = [start.getTime(), end.getTime()]
+    } else {
+      var start = new Date(this.data.form2.dimensionDateStart + ' 00:00:00')
+      var end = new Date(this.data.form2.dimensionDateEnd + ' 00:00:00')
+      this.data.vdate = [start.getTime(), end.getTime()]
+    }
+    this.setData({ show: true, vdate: this.data.vdate })
   },
   onClose: function() {
     this.setData({ show: false })
diff --git a/xtends/statics/sale-report/index.js b/xtends/statics/sale-report/index.js
index 07be3da..9485311 100644
--- a/xtends/statics/sale-report/index.js
+++ b/xtends/statics/sale-report/index.js
@@ -3,6 +3,25 @@ import { getSalesReport } from "../../../api/saas"
 import util from '../../../utils/util'
 
 const app = getApp()
+const columns1 = [
+  { prop: 'productCategoryName', width: 200, label: '品类', color: '#55C355' },
+  { prop: 'outboundDeliveryNetWeight', width: 180, label: '出货重量(吨)' },
+  { prop: 'settleWeight', width: 180, label: '结算重量(吨)' },
+  { prop: 'settleAvgPrice	', width: 220, label: '结算均价(元/吨)' },
+  { prop: 'settlePrice', width: 180, label: '结算金额(元)' }
+]
+const columns2 = [
+  { prop: 'productCategoryName', width: 200, label: '品类', color: '#55C355' },
+  { prop: 'outboundDeliveryNetWeight	', width: 185, label: '出货重量(吨)' },
+  { prop: 'netWeight', width: 180, label: '纸厂净重(吨)' },
+  { prop: 'differenceWeight	', width: 185, label: '差异重量(吨)' }
+]
+const columns3 = [
+  { prop: 'productCategoryName', width: 200, label: '品类', color: '#55C355' },
+  { prop: 'netWeight', width: 185, label: '纸厂净重(吨)' },
+  { prop: 'settleWeight', width: 185, label: '结算重量(吨)' },
+  { prop: 'avgDeductPercent	', width: 180, label: '平均扣点(%)' }
+]
 
 Scene({
   /**
@@ -11,13 +30,8 @@ Scene({
   data: {
     height: app.globalData.fragmentHeight,
     form: {},
-    columns: [
-      { prop: 'productCategoryName', width: 200, label: '品类', color: '#55C355' },
-      { prop: 'outboundDeliveryNetWeight', width: 180, label: '出货重量(吨)' },
-      { prop: 'settleWeight', width: 180, label: '结算重量(吨)' },
-      { prop: 'settleAvgPrice	', width: 220, label: '结算均价(元/吨)' },
-      { prop: 'settlePrice', width: 180, label: '结算金额(元)' }
-    ],
+    columnsList: [ columns1, columns2, columns3 ],
+    columns: columns1,
     reportInfo:{
       productSalesDailyReportList: [],
       carNumber: 0,
@@ -45,7 +59,7 @@ Scene({
     var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D')
     this.data.form.dimensionDateStart = util.formatDate(today, 'Y-M-D')
     this.data.form.dimensionDateEnd = util.formatDate(max, 'Y-M-D')
-    this.setData({ height: app.globalData.fragmentHeight - 404, minDate, maxDate, vdate, vdateString })
+    this.setData({ height: app.globalData.fragmentHeight - 484, minDate, maxDate, vdate, vdateString })
     this.fetchStatisticsInfo()
   },
   showCalendar: function(){
@@ -54,6 +68,13 @@ Scene({
   onClose: function() {
     this.setData({ show: false })
   },
+  onTabChange: function ({ detail }) {
+    if (this.data.tabIndex == Number(detail.index)) {
+      return
+    }
+    this.setData({ columns: this.data.columnsList[detail.index] })
+    this.data.tabIndex = Number(detail.index)
+  },
   onSelect: function({detail}) {
     var start = new Date(detail[0])
     var end = new Date(detail[1])
diff --git a/xtends/statics/sale-report/index.json b/xtends/statics/sale-report/index.json
index 4209c60..009fb08 100644
--- a/xtends/statics/sale-report/index.json
+++ b/xtends/statics/sale-report/index.json
@@ -3,6 +3,8 @@
     "van-icon": "/components/icon/index",
     "van-table": "/components/table/index",
     "van-calendar": "/components/calendar/index",
+    "van-tab": "/components/tab/index",
+    "van-tabs": "/components/tabs/index",
     "notification": "/pages/message/notification/index"
   }
 }
\ No newline at end of file
diff --git a/xtends/statics/sale-report/index.wxml b/xtends/statics/sale-report/index.wxml
index b9b63b5..922855a 100644
--- a/xtends/statics/sale-report/index.wxml
+++ b/xtends/statics/sale-report/index.wxml
@@ -34,7 +34,13 @@
     <view class="text-black text-sm">金额(元)</view>
   </view>
 </view>
-
+<view class="bg-white" style="height:80rpx;">
+  <van-tabs type="card" color="#008AFF" bind:change="onTabChange">
+    <van-tab title="金额"></van-tab>
+    <van-tab title="重量差异"></van-tab>
+    <van-tab title="平均扣点"></van-tab>
+  </van-tabs>
+</view>
 <van-table headers="{{columns}}" data="{{ reportInfo.productSalesDailyReportList }}" height="{{ height }}" stripe="{{ true }}"/>
 
 <van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" title="日期范围选择" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>