libo
/
ztb-saas-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

no message

feature/v2.1
xpz2018 4 years ago
parent
e34c10caa5
commit
ababb528b2
5 changed files with 47 additions and 100 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      api/saas.js
  2. 62
      xtends/statics/agent-report/index.js
  3. 70
      xtends/statics/gross-report/index.js
  4. 8
      xtends/statics/gross-report/index.wxml
  5. 1
      xtends/statics/purchase-report/index.js

6
api/saas.js
View File

@ -78,6 +78,8 @@ const repeatSideOrder = (params) => mPost(`/ztb-factory/renew/scrap-paper-offsit
const getReceiptReport = (params) => mGet(`/ztb-factory/get/receipt-daily-report`, params, sconfig) const getReceiptReport = (params) => mGet(`/ztb-factory/get/receipt-daily-report`, params, sconfig)
const getSalesReport = (params) => mGet(`/ztb-factory/get/sales-daily-report`, params, sconfig) const getSalesReport = (params) => mGet(`/ztb-factory/get/sales-daily-report`, params, sconfig)
const getGrossReport = (params) => mGet(`/ztb-factory/get/gross-profit-daily-report`, params, sconfig)
const getAgentReport = (params) => mGet(`/ztb-factory/get/gross-profit-daily-report`, params, sconfig)
export { export {
sconfig, sconfig,
@ -146,5 +148,7 @@ export {
priceSideOrder, priceSideOrder,
repeatSideOrder, repeatSideOrder,
getReceiptReport, getReceiptReport,
getSalesReport
getSalesReport,
getGrossReport,
getAgentReport
} }

62
xtends/statics/agent-report/index.js
View File

@ -1,5 +1,5 @@
import Scene from '../../../pages/index/scene' import Scene from '../../../pages/index/scene'
import { getStatisticsInfo } from "../../../api/saas"
import { getAgentReport } from "../../../api/saas"
import util from '../../../utils/util' import util from '../../../utils/util'
const app = getApp() const app = getApp()
@ -17,44 +17,12 @@ Scene({
{ prop: 'sign_out_time', width: 200, label: '实收金额(元)' }, { prop: 'sign_out_time', width: 200, label: '实收金额(元)' },
{ prop: 'work_hour', width: 150, label: '代卖费(元)' } { prop: 'work_hour', width: 150, label: '代卖费(元)' }
], ],
data: [
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '187500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '187500.00', work_hour: '2.500'},
],
reportInfo:{
productGrossProfitReportList: [],
totalGrossProfit: 0,
totalSalesPrice: 0,
totalReceiptPrice: 0
},
show: false show: false
}, },
/** /**
@ -73,8 +41,8 @@ Scene({
today.setHours(0, 0, 0) today.setHours(0, 0, 0)
var vdate = [today.getTime(), maxDate] var vdate = [today.getTime(), maxDate]
var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D') var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D')
this.data.form.startTime = util.formatDate(today, 'Y-M-D') + ' 00:00:00'
this.data.form.endTime = util.formatDate(max, 'Y-M-D') + ' 00:00:00'
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 - 404, minDate, maxDate, vdate, vdateString })
this.fetchStatisticsInfo() this.fetchStatisticsInfo()
}, },
@ -88,15 +56,19 @@ Scene({
var start = new Date(detail[0]) var start = new Date(detail[0])
var end = new Date(detail[1]) var end = new Date(detail[1])
var vdateString = util.formatDate(start, 'Y-M-D') + '至' + util.formatDate(end, 'Y-M-D') var vdateString = util.formatDate(start, 'Y-M-D') + '至' + util.formatDate(end, 'Y-M-D')
this.data.form.startTime = util.formatDate(start, 'Y-M-D') + ' 00:00:00'
this.data.form.endTime = util.formatDate(end, 'Y-M-D') + ' 00:00:00'
this.data.form.dimensionDateStart = util.formatDate(start, 'Y-M-D')
this.data.form.dimensionDateEnd = util.formatDate(end, 'Y-M-D')
this.setData({ show: false, vdateString }) this.setData({ show: false, vdateString })
wx.showLoading({ title: '加载中', mask: true }) wx.showLoading({ title: '加载中', mask: true })
this.fetchStatisticsInfo() this.fetchStatisticsInfo()
}, },
fetchStatisticsInfo: function(){ fetchStatisticsInfo: function(){
getStatisticsInfo(this.data.form).then(result => {
// this.setData({ })
getAgentReport(this.data.form).then(result => {
if(result.data){
this.setData({ reportInfo: result.data })
} else {
this.setData({ reportInfo: { productGrossProfitReportList: [], totalGrossProfit: 0, totalSalesPrice: 0, totalReceiptPrice: 0 } })
}
wx.hideLoading() wx.hideLoading()
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()

70
xtends/statics/gross-report/index.js
View File

@ -1,5 +1,5 @@
import Scene from '../../../pages/index/scene' import Scene from '../../../pages/index/scene'
import { getStatisticsInfo } from "../../../api/saas"
import { getGrossReport } from "../../../api/saas"
import util from '../../../utils/util' import util from '../../../utils/util'
const app = getApp() const app = getApp()
@ -12,49 +12,17 @@ Scene({
height: app.globalData.fragmentHeight, height: app.globalData.fragmentHeight,
form: {}, form: {},
columns: [ columns: [
{ prop: 'datetime', width: 200, label: '品类', color: '#55C355' },
{ prop: 'sign_in_time', width: 200, label: '采购金额(元)' },
{ prop: 'sign_out_time', width: 200, label: '销售金额(元)' },
{ prop: 'work_hour', width: 175, label: '毛利(元)' }
],
data: [
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '187500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '87500.00', work_hour: '2.500', status: '2.500'},
{datetime: '黄纸皮A级', sign_in_time: '35000.00', sign_out_time: '187500.00', work_hour: '2.500', status: '2.500'},
{ prop: 'productCategoryName', width: 200, label: '品类', color: '#55C355' },
{ prop: 'receiptPrice', width: 200, label: '采购金额(元)' },
{ prop: 'salesPrice ', width: 200, label: '销售金额(元)' },
{ prop: 'grossProfit', width: 175, label: '毛利(元)' }
], ],
reportInfo:{
productGrossProfitReportList: [],
totalGrossProfit: 0,
totalSalesPrice: 0,
totalReceiptPrice: 0
},
show: false show: false
}, },
/** /**
@ -73,8 +41,8 @@ Scene({
today.setHours(0, 0, 0) today.setHours(0, 0, 0)
var vdate = [today.getTime(), maxDate] var vdate = [today.getTime(), maxDate]
var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D') var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D')
this.data.form.startTime = util.formatDate(today, 'Y-M-D') + ' 00:00:00'
this.data.form.endTime = util.formatDate(max, 'Y-M-D') + ' 00:00:00'
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 - 404, minDate, maxDate, vdate, vdateString })
this.fetchStatisticsInfo() this.fetchStatisticsInfo()
}, },
@ -88,15 +56,19 @@ Scene({
var start = new Date(detail[0]) var start = new Date(detail[0])
var end = new Date(detail[1]) var end = new Date(detail[1])
var vdateString = util.formatDate(start, 'Y-M-D') + '至' + util.formatDate(end, 'Y-M-D') var vdateString = util.formatDate(start, 'Y-M-D') + '至' + util.formatDate(end, 'Y-M-D')
this.data.form.startTime = util.formatDate(start, 'Y-M-D') + ' 00:00:00'
this.data.form.endTime = util.formatDate(end, 'Y-M-D') + ' 00:00:00'
this.data.form.dimensionDateStart = util.formatDate(start, 'Y-M-D')
this.data.form.dimensionDateEnd = util.formatDate(end, 'Y-M-D')
this.setData({ show: false, vdateString }) this.setData({ show: false, vdateString })
wx.showLoading({ title: '加载中', mask: true }) wx.showLoading({ title: '加载中', mask: true })
this.fetchStatisticsInfo() this.fetchStatisticsInfo()
}, },
fetchStatisticsInfo: function(){ fetchStatisticsInfo: function(){
getStatisticsInfo(this.data.form).then(result => {
// this.setData({ })
getGrossReport(this.data.form).then(result => {
if(result.data){
this.setData({ reportInfo: result.data })
} else {
this.setData({ reportInfo: { productGrossProfitReportList: [], totalGrossProfit: 0, totalSalesPrice: 0, totalReceiptPrice: 0 } })
}
wx.hideLoading() wx.hideLoading()
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()

8
xtends/statics/gross-report/index.wxml
View File

@ -16,24 +16,24 @@
</view> </view>
<view class="bg-white flex" style="height:120rpx;padding-top:24rpx;"> <view class="bg-white flex" style="height:120rpx;padding-top:24rpx;">
<view style="width:320rpx;padding-left:48rpx"> <view style="width:320rpx;padding-left:48rpx">
<view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(totalInfo.totalWeight || 0)}}</view>
<view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalSalesPrice || 0)}}</view>
<view class="text-black text-sm">总支出(元)</view> <view class="text-black text-sm">总支出(元)</view>
</view> </view>
<view style="width:300rpx;"> <view style="width:300rpx;">
<view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(totalInfo.totalWeight || 0)}}</view>
<view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalReceiptPrice || 0)}}</view>
<view class="text-black text-sm">总收入(元)</view> <view class="text-black text-sm">总收入(元)</view>
</view> </view>
</view> </view>
<view class="bg-white flex" style="height:120rpx;padding-top:8rpx"> <view class="bg-white flex" style="height:120rpx;padding-top:8rpx">
<view style="width:320rpx;padding-left:48rpx"> <view style="width:320rpx;padding-left:48rpx">
<view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(totalInfo.totalWeight || 0)}}</view>
<view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalGrossProfit || 0)}}</view>
<view class="text-black text-sm">总毛利(元)</view> <view class="text-black text-sm">总毛利(元)</view>
</view> </view>
<view style="width:300rpx;"> <view style="width:300rpx;">
</view> </view>
</view> </view>
<!-- <van-table columns="{{columns}}" height="{{height}}" data="{{data}}"></van-table> --> <!-- <van-table columns="{{columns}}" height="{{height}}" data="{{data}}"></van-table> -->
<van-table headers="{{columns}}" data="{{ data }}" height="{{ height }}" stripe="{{ true }}"/>
<van-table headers="{{columns}}" data="{{ reportInfo.productGrossProfitReportList }}" 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"/> <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"/>
<notification id="qn-notification"/> <notification id="qn-notification"/>

1
xtends/statics/purchase-report/index.js
View File

@ -68,7 +68,6 @@ Scene({
} else { } else {
this.setData({reportInfo: { productReceiptReportList: [], totalSettlePrice: 0, totalSettleWeight: 0 } }) this.setData({reportInfo: { productReceiptReportList: [], totalSettlePrice: 0, totalSettleWeight: 0 } })
} }
console.log(result)
wx.hideLoading() wx.hideLoading()
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()

Write Preview
Loading…
Cancel
Save