diff --git a/api/saas.js b/api/saas.js index d99a3bc..4ae426a 100644 --- a/api/saas.js +++ b/api/saas.js @@ -76,7 +76,8 @@ const poundSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsit const priceSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-order-price`, params, sconfig) const repeatSideOrder = (params) => mPost(`/ztb-factory/renew/scrap-paper-offsite-receipt-order-price`, params, sconfig) -const getSummaryReport = (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) export { sconfig, @@ -144,5 +145,6 @@ export { poundSideOrder, priceSideOrder, repeatSideOrder, - getSummaryReport + getReceiptReport, + getSalesReport } \ No newline at end of file diff --git a/components/textarea/index.js b/components/textarea/index.js index a4d4938..03ca4ef 100644 --- a/components/textarea/index.js +++ b/components/textarea/index.js @@ -20,7 +20,9 @@ Component({ * 组件的初始数据 */ data: { - editing: false + editing: false, + scroll_top: 0, + top: 0, }, /** @@ -29,9 +31,41 @@ Component({ methods: { onEdit: function(e) { this.setData({ editing: true }) + if (this.data.scroll_top > 0 || Number(e.detail.height) <= 0) { + return; + } + if(this.data.top > 0){ + that.triggerEvent('focus', that.data.top) + return + } + const res = wx.getSystemInfoSync(); + let windowHeight = res.windowHeight; + let keybordHeight = e.detail.height; + const query = wx.createSelectorQuery(); + query.select('#' + e.currentTarget.id).boundingClientRect(); + query.selectViewport().scrollOffset(); + var that = this; + query.exec(function(res) { + if (!res[0]) { + that.data.scroll_top = 0 + that.triggerEvent('focus', 0) + return; + } + let bottom = res[0].bottom; + if ((windowHeight - keybordHeight) < (bottom + 20)) { + that.data.scroll_top = bottom + 80 - windowHeight - keybordHeight + that.data.top = that.data.scroll_top + that.triggerEvent('focus', that.data.scroll_top) + } else { + that.triggerEvent('focus', 0) + that.data.scroll_top = 0 + } + }) }, onBlur: function(e) { this.setData({ editing: false }) + this.data.scroll_top = 0 + this.triggerEvent('focus', 0) }, bindInput: function(e) { this.setData({ value: e.detail.value }) diff --git a/components/textarea/index.wxml b/components/textarea/index.wxml index 649bb3d..9451327 100644 --- a/components/textarea/index.wxml +++ b/components/textarea/index.wxml @@ -1,4 +1,4 @@ {{value || placeholder }} - \ No newline at end of file diff --git a/pages/agent/appointment/index.js b/pages/agent/appointment/index.js index 7af4f7f..db5bef1 100644 --- a/pages/agent/appointment/index.js +++ b/pages/agent/appointment/index.js @@ -32,7 +32,8 @@ Scene({ toolId: '', visible: false, show: false, - code: '' + code: '', + marginTop: 0 }, onLoad: function (options) { if(options.activityId){ @@ -120,6 +121,9 @@ Scene({ this.setData({ [form_data]: e.detail }) } }, + bindFocus: function(e){ + // this.setData({ marginTop: e.detail }) + }, bindInput: function (e) { if(!util.isEmpty(e.currentTarget.id)){ var form_data = 'form.' + e.currentTarget.id diff --git a/pages/agent/appointment/index.wxml b/pages/agent/appointment/index.wxml index 4a1806b..1681f32 100644 --- a/pages/agent/appointment/index.wxml +++ b/pages/agent/appointment/index.wxml @@ -4,88 +4,89 @@ 代卖预约 - - - 提交订单 - - 等待预约 - - 线下送货 - - 余额提现 - - - - - 纸品信息 - - - - 纸厂名称 - {{factoryDetail.name}} + + + + 提交订单 + + 等待预约 + + 线下送货 + + 余额提现 - - - - 纸品品类 - {{cateName || '请选择品类'}} + + + + 纸品信息 - - - - 预估单价(元/吨) - - {{formate.formatePrice(form.unitPrice)}} - (已含补贴{{formate.formatePrice(form.publicSubsidies)}}元/吨) + + + 纸厂名称 + {{factoryDetail.name}} + + + + + 纸品品类 + {{cateName || '请选择品类'}} + + + + + 预估单价(元/吨) + + {{formate.formatePrice(form.unitPrice)}} + (已含补贴{{formate.formatePrice(form.publicSubsidies)}}元/吨) + + + + + + 预估重量(吨) + + + + + 货到时间 + {{form.deliveryTime||'请选择货到时间'}} + + + + + 车辆信息 - - - - 预估重量(吨) + + + {{item.plateNumber}} + - - - - 货到时间 - {{form.deliveryTime||'请选择货到时间'}} + + + + {{index + 1}} + 货车车牌： + + {{item.plateNumber || '点击输入车牌号码'}} + + + + + + 添加车辆 - - - - 车辆信息 - - - - {{item.plateNumber}} + + + 其他信息 - - - - - {{index + 1}} - 货车车牌： - - {{item.plateNumber || '点击输入车牌号码'}} - + + - - - - 添加车辆 - - - - - 其他信息 - - - - - - - + + + 提交订单 diff --git a/xtends/statics/index/index.js b/xtends/statics/index/index.js index fcb7232..bf1e5bd 100644 --- a/xtends/statics/index/index.js +++ b/xtends/statics/index/index.js @@ -1,7 +1,7 @@ // xtends//statics/index/index.js import Scene from '../../../pages/index/scene' import uCharts from '../../libs/u-charts'; -import { getSummaryReport } from "../../../api/saas" +import { getReceiptReport } from "../../../api/saas" const math = require('../../../utils/math') import util from '../../../utils/util' const app = getApp() @@ -52,7 +52,7 @@ Scene({ this.fetchSummaryInfo(this.data.form1) }, fetchSummaryInfo: function(form){ - getSummaryReport(form).then(result => { + getReceiptReport(form).then(result => { // this.setData({ }) wx.hideLoading() }).catch(err => { diff --git a/xtends/statics/purchase-report/index.js b/xtends/statics/purchase-report/index.js index 81a3302..92eebb8 100644 --- a/xtends/statics/purchase-report/index.js +++ b/xtends/statics/purchase-report/index.js @@ -1,5 +1,5 @@ import Scene from '../../../pages/index/scene' -import { getSummaryReport } from "../../../api/saas" +import { getReceiptReport } from "../../../api/saas" import util from '../../../utils/util' const app = getApp() @@ -12,49 +12,16 @@ Scene({ height: app.globalData.fragmentHeight, form: {}, columns: [ - { prop: 'datetime', width: 200, label: '品类', color: '#55C355' }, - { prop: 'sign_in_time', width: 175, label: '重量(公斤)' }, - { prop: 'sign_out_time', width: 175, label: '金额(元)' }, - { prop: 'work_hour', width: 200, 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: 'settleWeight', width: 175, label: '重量(公斤)' }, + { prop: 'settlePrice', width: 175, label: '金额(元)' }, + { prop: 'settleAvgPrice', width: 200, label: '均价(元/公斤)' } ], + reportInfo:{ + productReceiptReportList: [], + totalSettlePrice: 0, + totalSettleWeight: 0 + }, show: false }, /** @@ -72,9 +39,9 @@ Scene({ var today = new Date() today.setHours(0, 0, 0) var vdate = [today.getTime(), maxDate] - 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') + var vdateString = util.formatDate(min, 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D') + this.data.form.dimensionDateStart = util.formatDate(min, 'Y-M-D') + this.data.form.dimensionDateEnd = util.formatDate(today, 'Y-M-D') this.setData({ height: app.globalData.fragmentHeight - 304, minDate, maxDate, vdate, vdateString }) this.fetchStatisticsInfo() }, @@ -89,14 +56,19 @@ Scene({ var start = new Date(detail[0]) var end = new Date(detail[1]) 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.fetchStatisticsInfo() }, fetchStatisticsInfo: function(){ - getSummaryReport(this.data.form).then(result => { - // this.setData({ }) + getReceiptReport(this.data.form).then(result => { + if(result.data){ + this.setData({reportInfo: result.data}) + } else { + this.setData({reportInfo: { productReceiptReportList: [], totalSettlePrice: 0, totalSettleWeight: 0 } }) + } + console.log(result) wx.hideLoading() }).catch(err => { wx.hideLoading() diff --git a/xtends/statics/purchase-report/index.wxml b/xtends/statics/purchase-report/index.wxml index 29fc667..d2e09ae 100644 --- a/xtends/statics/purchase-report/index.wxml +++ b/xtends/statics/purchase-report/index.wxml @@ -16,15 +16,15 @@ - {{formate.formateWeight(totalInfo.totalWeight || 0)}} + {{formate.formateWeight(reportInfo.totalSettleWeight || 0)}} 重量(公斤) - {{formate.formateWeight(totalInfo.totalWeight || 0)}} + {{formate.formateWeight(reportInfo.totalSettlePrice || 0)}} 合计金额(元) - + diff --git a/xtends/statics/sale-report/index.js b/xtends/statics/sale-report/index.js index 0149923..d0c07f4 100644 --- a/xtends/statics/sale-report/index.js +++ b/xtends/statics/sale-report/index.js @@ -1,5 +1,5 @@ import Scene from '../../../pages/index/scene' -import { getStatisticsInfo } from "../../../api/saas" +import { getSalesReport } from "../../../api/saas" import util from '../../../utils/util' const app = getApp() @@ -18,44 +18,12 @@ Scene({ { prop: 'work_hour', width: 220, label: '结算均价(元/吨)' }, { prop: 'status', width: 180, 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'}, - ], + reportInfo:{ + productSalesDailyReportList: [], + totalOutboundDeliveryNetWeight: 0, + totalSettlePrice: 0, + totalSettleWeight: 0 + }, show: false }, /** @@ -74,8 +42,8 @@ Scene({ today.setHours(0, 0, 0) var vdate = [today.getTime(), maxDate] 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.fetchStatisticsInfo() }, @@ -89,16 +57,20 @@ Scene({ var start = new Date(detail[0]) var end = new Date(detail[1]) 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 }) wx.showLoading({ title: '加载中', mask: true }) this.fetchStatisticsInfo() }, fetchStatisticsInfo: function(){ - getStatisticsInfo(this.data.form).then(result => { - // this.setData({ }) + getSalesReport(this.data.form).then(result => { wx.hideLoading() + if(result.data){ + this.setData({reportInfo: result.data}) + } else { + this.setData({ reportInfo: { productSalesDailyReportList: [], totalOutboundDeliveryNetWeight: 0, totalSettlePrice: 0, totalSettleWeight: 0 } }) + } }).catch(err => { wx.hideLoading() }) diff --git a/xtends/statics/sale-report/index.wxml b/xtends/statics/sale-report/index.wxml index 364ccca..b9b63b5 100644 --- a/xtends/statics/sale-report/index.wxml +++ b/xtends/statics/sale-report/index.wxml @@ -16,26 +16,26 @@ - {{formate.formateWeight(totalInfo.totalWeight || 0)}} + {{formate.formateWeight(reportInfo.totalOutboundDeliveryNetWeight || 0)}} 出货重量(吨) - {{formate.formateWeight(totalInfo.totalWeight || 0)}} + {{formate.formateWeight(reportInfo.totalSettlePrice || 0)}} 结算重量(吨) - {{formate.formateWeight(totalInfo.totalWeight || 0)}} + {{reportInfo.carNumber || 0}} 出货车数(车) - {{formate.formateWeight(totalInfo.totalWeight || 0)}} + {{formate.formateWeight(reportInfo.totalSettlePrice || 0)}} 金额(元) - +