diff --git a/api/saas.js b/api/saas.js
index 5bda9f7..d99a3bc 100644
--- a/api/saas.js
+++ b/api/saas.js
@@ -76,6 +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)
+
export {
sconfig,
loginToken,
@@ -141,5 +143,6 @@ export {
saveSideOrder,
poundSideOrder,
priceSideOrder,
- repeatSideOrder
+ repeatSideOrder,
+ getSummaryReport
}
\ No newline at end of file
diff --git a/assets/home/icon-report.png b/assets/home/icon-report.png
new file mode 100644
index 0000000..57539db
Binary files /dev/null and b/assets/home/icon-report.png differ
diff --git a/components/circle/canvas.js b/components/circle/canvas.js
new file mode 100644
index 0000000..c311335
--- /dev/null
+++ b/components/circle/canvas.js
@@ -0,0 +1,43 @@
+export function adaptor(ctx) {
+ // @ts-ignore
+ return Object.assign(ctx, {
+ setStrokeStyle(val) {
+ ctx.strokeStyle = val;
+ },
+ setLineWidth(val) {
+ ctx.lineWidth = val;
+ },
+ setLineCap(val) {
+ ctx.lineCap = val;
+ },
+ setFillStyle(val) {
+ ctx.fillStyle = val;
+ },
+ setFontSize(val) {
+ ctx.font = String(val);
+ },
+ setGlobalAlpha(val) {
+ ctx.globalAlpha = val;
+ },
+ setLineJoin(val) {
+ ctx.lineJoin = val;
+ },
+ setTextAlign(val) {
+ ctx.textAlign = val;
+ },
+ setMiterLimit(val) {
+ ctx.miterLimit = val;
+ },
+ setShadow(offsetX, offsetY, blur, color) {
+ ctx.shadowOffsetX = offsetX;
+ ctx.shadowOffsetY = offsetY;
+ ctx.shadowBlur = blur;
+ ctx.shadowColor = color;
+ },
+ setTextBaseline(val) {
+ ctx.textBaseline = val;
+ },
+ createCircularGradient() {},
+ draw() {},
+ });
+}
diff --git a/components/circle/index.js b/components/circle/index.js
new file mode 100644
index 0000000..dd27f52
--- /dev/null
+++ b/components/circle/index.js
@@ -0,0 +1,185 @@
+import { VantComponent } from '../common/component';
+import { BLUE, WHITE } from '../common/color';
+import { adaptor } from './canvas';
+import { isObj } from '../common/validator';
+import { getSystemInfoSync } from '../common/utils';
+function format(rate) {
+ return Math.min(Math.max(rate, 0), 100);
+}
+const PERIMETER = 2 * Math.PI;
+const BEGIN_ANGLE = -Math.PI / 2;
+const STEP = 1;
+VantComponent({
+ props: {
+ text: String,
+ lineCap: {
+ type: String,
+ value: 'round',
+ },
+ value: {
+ type: Number,
+ value: 0,
+ observer: 'reRender',
+ },
+ speed: {
+ type: Number,
+ value: 50,
+ },
+ size: {
+ type: Number,
+ value: 100,
+ observer() {
+ this.drawCircle(this.currentValue);
+ },
+ },
+ fill: String,
+ layerColor: {
+ type: String,
+ value: WHITE,
+ },
+ color: {
+ type: null,
+ value: BLUE,
+ observer() {
+ this.setHoverColor().then(() => {
+ this.drawCircle(this.currentValue);
+ });
+ },
+ },
+ type: {
+ type: String,
+ value: '',
+ },
+ strokeWidth: {
+ type: Number,
+ value: 4,
+ },
+ clockwise: {
+ type: Boolean,
+ value: true,
+ },
+ },
+ data: {
+ hoverColor: BLUE,
+ },
+ methods: {
+ getContext() {
+ const { type, size } = this.data;
+ if (type === '') {
+ const ctx = wx.createCanvasContext('van-circle', this);
+ return Promise.resolve(ctx);
+ }
+ const dpr = getSystemInfoSync().pixelRatio;
+ return new Promise((resolve) => {
+ wx.createSelectorQuery()
+ .in(this)
+ .select('#van-circle')
+ .node()
+ .exec((res) => {
+ const canvas = res[0].node;
+ const ctx = canvas.getContext(type);
+ if (!this.inited) {
+ this.inited = true;
+ canvas.width = size * dpr;
+ canvas.height = size * dpr;
+ ctx.scale(dpr, dpr);
+ }
+ resolve(adaptor(ctx));
+ });
+ });
+ },
+ setHoverColor() {
+ const { color, size } = this.data;
+ if (isObj(color)) {
+ return this.getContext().then((context) => {
+ const LinearColor = context.createLinearGradient(size, 0, 0, 0);
+ Object.keys(color)
+ .sort((a, b) => parseFloat(a) - parseFloat(b))
+ .map((key) =>
+ LinearColor.addColorStop(parseFloat(key) / 100, color[key])
+ );
+ this.hoverColor = LinearColor;
+ });
+ }
+ this.hoverColor = color;
+ return Promise.resolve();
+ },
+ presetCanvas(context, strokeStyle, beginAngle, endAngle, fill) {
+ const { strokeWidth, lineCap, clockwise, size } = this.data;
+ const position = size / 2;
+ const radius = position - strokeWidth / 2;
+ context.setStrokeStyle(strokeStyle);
+ context.setLineWidth(strokeWidth);
+ context.setLineCap(lineCap);
+ context.beginPath();
+ context.arc(position, position, radius, beginAngle, endAngle, !clockwise);
+ context.stroke();
+ if (fill) {
+ context.setFillStyle(fill);
+ context.fill();
+ }
+ },
+ renderLayerCircle(context) {
+ const { layerColor, fill } = this.data;
+ this.presetCanvas(context, layerColor, 0, PERIMETER, fill);
+ },
+ renderHoverCircle(context, formatValue) {
+ const { clockwise } = this.data;
+ // 结束角度
+ const progress = PERIMETER * (formatValue / 100);
+ const endAngle = clockwise
+ ? BEGIN_ANGLE + progress
+ : 3 * Math.PI - (BEGIN_ANGLE + progress);
+ this.presetCanvas(context, this.hoverColor, BEGIN_ANGLE, endAngle);
+ },
+ drawCircle(currentValue) {
+ const { size } = this.data;
+ this.getContext().then((context) => {
+ context.clearRect(0, 0, size, size);
+ this.renderLayerCircle(context);
+ const formatValue = format(currentValue);
+ if (formatValue !== 0) {
+ this.renderHoverCircle(context, formatValue);
+ }
+ context.draw();
+ });
+ },
+ reRender() {
+ // tofector 动画暂时没有想到好的解决方案
+ const { value, speed } = this.data;
+ if (speed <= 0 || speed > 1000) {
+ this.drawCircle(value);
+ return;
+ }
+ this.clearInterval();
+ this.currentValue = this.currentValue || 0;
+ this.interval = setInterval(() => {
+ if (this.currentValue !== value) {
+ if (this.currentValue < value) {
+ this.currentValue += STEP;
+ } else {
+ this.currentValue -= STEP;
+ }
+ this.drawCircle(this.currentValue);
+ } else {
+ this.clearInterval();
+ }
+ }, 1000 / speed);
+ },
+ clearInterval() {
+ if (this.interval) {
+ clearInterval(this.interval);
+ this.interval = null;
+ }
+ },
+ },
+ mounted() {
+ this.currentValue = this.data.value;
+ this.setHoverColor().then(() => {
+ this.drawCircle(this.currentValue);
+ });
+ },
+ destroyed() {
+ this.clearInterval();
+ },
+});
diff --git a/components/circle/index.json b/components/circle/index.json
new file mode 100644
index 0000000..467ce29
--- /dev/null
+++ b/components/circle/index.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+}
diff --git a/components/circle/index.wxml b/components/circle/index.wxml
new file mode 100644
index 0000000..52bc59f
--- /dev/null
+++ b/components/circle/index.wxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+ {{ text }}
+
diff --git a/components/circle/index.wxss b/components/circle/index.wxss
new file mode 100644
index 0000000..3ab63df
--- /dev/null
+++ b/components/circle/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-circle{position:relative;display:inline-block;text-align:center}.van-circle__text{position:absolute;top:50%;left:0;width:100%;-webkit-transform:translateY(-50%);transform:translateY(-50%);color:#323233;color:var(--circle-text-color,#323233)}
\ No newline at end of file
diff --git a/components/grid-item/index.js b/components/grid-item/index.js
index e75d9c4..7d2ac40 100644
--- a/components/grid-item/index.js
+++ b/components/grid-item/index.js
@@ -14,6 +14,7 @@ VantComponent({
dot: Boolean,
info: null,
text: String,
+ contentStyle: String,
useSlot: Boolean
},
data: {
@@ -54,7 +55,7 @@ VantComponent({
}
this.setData({
viewStyle: styleWrapper.join('; '),
- contentStyle,
+ // contentStyle,
center,
border,
square,
diff --git a/components/grid-item/index.wxml b/components/grid-item/index.wxml
index 061f43c..69fdb61 100644
--- a/components/grid-item/index.wxml
+++ b/components/grid-item/index.wxml
@@ -1,10 +1,7 @@
-
+
@@ -19,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/components/table/index.js b/components/table/index.js
index 0d008d5..f75a5d6 100644
--- a/components/table/index.js
+++ b/components/table/index.js
@@ -1,138 +1,89 @@
-/** slot action 固定按钮操作
- * btnName 按钮名
- * valueCallback 按钮返回值
- 按钮绑定事件 btnClick
-
- tr绑定事件 onRowClick
- valueCallback tr返回值
-
- columns 数组 {
- key: '',
- title: '',
- width: 200,
- fixed: 'left', //设置fixed 必须设置width
- align: 'center',
-
- // 按钮默认 slot action
- slot: 'action'
- valueCallback: '',
- btnName: ''
- }
-**/
Component({
- options: {
- multipleSlots: true,
+ /**
+ * 外部样式类
+ */
+ externalClasses: ['header-row-class-name', 'row-class-name', 'cell-class-name'],
+ /**
+ * 组件样式隔离
+ */
+ options: {
+ styleIsolation: "isolated",
+ multipleSlots: true // 支持多个slot
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ data: {
+ type: Array,
+ value: []
},
- // 自定义外部样式class th头部样式 tr样式 td样式
- externalClasses: ['thead-row-class', 'tbody-tow-class', 'td-class'],
- properties: {
- // td 数组
- data: {
- type: Array,
- value: []
- },
- // thead 数组
- columns: {
- type: Array,
- value: []
- },
- // table 高度
- height: {
- type: String,
- value: 'auto'
- },
- // table 宽度
- width: {
- type: Number || String,
- value: 750
- },
- // 单元格的宽度
- tdWidth: {
- type: Number,
- value: 35
- },
- // 固定表头 thead达到Header的位置时就应该被fixed了
- offsetTop: {
- type: Number,
- value: 150
- },
- // 是否带有纵向边框
- isBorder: {
- type: Boolean,
- value: true
- },
- // 是否带有斑马条纹
- isStripe: {
- type: Boolean,
- value: true
- },
- // tr 返回值Key
- valueCallback: {
- type: String,
- value: ''
- },
- // 无数据时信息
- msg: {
- type: String,
- value: '暂无数据~'
- },
- // thead 固定
- isFixed: {
- type: Boolean,
- value: true
- },
+ headers: {
+ type: Array,
+ value: []
},
- data: {
- scrolWidth: '100%',
- marginTopValue: 0,
- leftWidth: 0,
- leftIndex: 0,
- rightWidth: 0,
- rightIndex: 0,
+ // table的高度, 溢出可滚动
+ height: {
+ type: Number || String,
+ value: 'auto'
+ },
+ width: {
+ type: Number || String,
+ value: '100%'
},
- // 生命周期
- lifetimes: {
- // 组件实例进入页面节点树时调用
- attached() {
- const scrolWidth = this.properties.columns.reduce((total, item) => total + item.width, 0)
- this.createSelectorQuery().selectAll(".thead .td").boundingClientRect((res) => {
- if (!isNaN(scrolWidth)) {
- this.properties.columns.map(item => {
- item.width = item.width / scrolWidth * this.properties.width
- })
- } else {
- this.properties.columns.map((item, index) => {
- item.width = res[index].width
- })
- }
- }).exec(res => {
- let list = [], listLeft = [], listRight = [], leftWidth = 0, rightWidth = 0;
- list = this.properties.columns.filter(item => !item.fixed)
- listLeft = this.properties.columns.filter(item => item.fixed == 'left')
- listLeft.map(item => {
- leftWidth += item.width
- })
- listRight = this.properties.columns.filter(item => item.fixed == 'right')
- listRight.map(item => {
- rightWidth += item.width
- })
- this.setData({
- columns: [...listLeft, ...list, ...listRight],
- marginTopValue: res[0][0].height,
- leftWidth: leftWidth,
- rightWidth: rightWidth,
- leftIndex: listLeft.length ? listLeft.length : 0,
- rightIndex: listRight.length ? this.properties.columns.length - listRight.length - 1 : 0
- })
- })
- },
+ // 单元格的宽度
+ tdWidth: {
+ type: Number,
+ value: 35
},
- methods: {
- onRowClick(e) {
- this.triggerEvent('rowClick', e.target.dataset)
- },
- onBtnClick(e) {
- this.triggerEvent('btnClick', e.target.dataset)
- }
+ // 固定表头 thead达到Header的位置时就应该被fixed了
+ offsetTop: {
+ type: Number,
+ value: 150
},
-})
\ No newline at end of file
+ // 是否带有纵向边框
+ stripe: {
+ type: Boolean,
+ value: false
+ },
+ // 是否带有纵向边框
+ border: {
+ type: Boolean,
+ value: true
+ },
+ msg: {
+ type: String,
+ value: '暂无数据~'
+ }
+ },
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ scrolWidth: '100%'
+ },
+ /**
+ * 组件的监听属性
+ */
+ observers: {
+ // 在 numberA 或者 numberB 被设置时，执行这个函数
+ 'headers': function headers(_headers) {
+ var reducer = function reducer(accumulator, currentValue) {
+ return accumulator + Number(currentValue.width);
+ };
+ var scrolWidth = _headers.reduce(reducer, 0);
+
+ this.setData({
+ scrolWidth: scrolWidth
+ });
+ }
+ },
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ onRowClick: function onRowClick(e) {
+ this.triggerEvent('rowClick', e, e.currentTarget.dataset.it);
+ }
+ }
+});
\ No newline at end of file
diff --git a/components/table/index.json b/components/table/index.json
index 467ce29..32640e0 100644
--- a/components/table/index.json
+++ b/components/table/index.json
@@ -1,3 +1,3 @@
{
"component": true
-}
+}
\ No newline at end of file
diff --git a/components/table/index.wxml b/components/table/index.wxml
index c263b1b..05e4883 100644
--- a/components/table/index.wxml
+++ b/components/table/index.wxml
@@ -1,22 +1,21 @@
-
-
- {{item.title}}
-
-
-
-
-
- {{item[thead['key']]}}
-
-
-
-
-
- {{msg}}
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+ {{it[head["prop"]]}}
+
+
+
+
+
+ {{ msg }}
+
+
+
\ No newline at end of file
diff --git a/components/table/index.wxss b/components/table/index.wxss
index bbfd2c7..1e9a64d 100644
--- a/components/table/index.wxss
+++ b/components/table/index.wxss
@@ -1,68 +1,86 @@
+
.table {
+ position: relative;
font-size: 28rpx;
background: #fff;
border-right:none;
+ /* border-radius: 8rpx; */
overflow: hidden;
}
.thead{
+ border-bottom: none;
display: flex;
- border: 1px solid #ebeef5;
+ justify-content: flex-start;
+ /* border-top-right-radius: 8rpx;
+ border-top-left-radius: 8rpx; */
+ overflow: visible;
+ color: #909399;
+ border: 1rpx solid #ebeef5;
box-sizing: border-box;
- z-index: 9;
}
.thead .td {
- padding: 20rpx 10rpx;
+ /* padding: 20rpx 10rpx; */
font-weight: bold;
display: inline-block;
+ white-space:nowrap;
+ text-align: center;
border-right: 1rpx solid #fff;
- background: #fff;
}
-.thead-border .td, .tbody-tr-border .td {
+.thead .td:last-child {
+ border-right: none;
+}
+.thead-border .td {
border-right: 1rpx solid #ebeef5;
}
-.thead .td:last-child, .tbody-tr-border .td:last-child{
+.thead-border .td:last-child {
border-right: none;
}
+/* .tr{
+ display: flex;
+ white-space:nowrap;
+} */
.tbody {
box-sizing: border-box;
font-size: 28rpx;
color: #666;
- border: 1px solid #ebeef5;
+ border: 1px solid #ebeef5;
border-top: none;
+ /* border-bottom-left-radius: 8rpx;
+ border-bottom-right-radius: 8rpx; */
}
.tbody-tr {
- border-bottom: 1px solid #ebeef5;
display: flex;
+ border-bottom: 1px solid #ebeef5;
}
-.tbody-tr .td {
- padding: 20rpx 10rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- background: #fff;
-}
+/* .tbody-tr:last-child {
+ border-bottom-left-radius: 8rpx;
+ border-bottom-right-radius: 8rpx;
+} */
+
.tbody-tr-stripe {
background: #fff;
border-bottom: none;
}
-.tbody-tr-stripe:nth-child(2n) .td{
+.tbody-tr-stripe:nth-child(2n) {
background: #F6F6F6;
}
-/* .tbody-tr .td text {
- line-height: 0;
-} */
-.tbody-tr .td .btn {
- font-size: 28rpx;
- padding:0 5rpx;
- color: #666;
- width: 30px;
+.tbody-tr .td {
+ white-space: wrap;
+ height: 80rpx;
+ /* padding:20rpx 10rpx; */
+ line-height: 80rpx;
+ text-align: center;
}
-.td {
- overflow: hidden;
- word-break: break-all;
+
+.tbody-tr-border .td {
+ border-right: 1rpx solid #F6F6F6;
+}
+.tbody-tr-border .td:last-child {
+ border-right: none;
}
.no-data {
- text-align: center;
- padding: 40rpx;
+ display: flex;
+ padding: 50rpx;
color: #666;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index f6175dd..e64ebec 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -47,7 +47,7 @@
-
+
diff --git a/xtends/image/icon-agent.png b/xtends/image/icon-agent.png
new file mode 100644
index 0000000..d5d2885
Binary files /dev/null and b/xtends/image/icon-agent.png differ
diff --git a/xtends/image/icon-gross.png b/xtends/image/icon-gross.png
new file mode 100644
index 0000000..43d86f3
Binary files /dev/null and b/xtends/image/icon-gross.png differ
diff --git a/xtends/image/icon-purchase.png b/xtends/image/icon-purchase.png
new file mode 100644
index 0000000..1f069a4
Binary files /dev/null and b/xtends/image/icon-purchase.png differ
diff --git a/xtends/image/icon-sale.png b/xtends/image/icon-sale.png
new file mode 100644
index 0000000..26d022e
Binary files /dev/null and b/xtends/image/icon-sale.png differ
diff --git a/xtends/statics/agent-report/index.js b/xtends/statics/agent-report/index.js
index 5c68e07..8d92bb0 100644
--- a/xtends/statics/agent-report/index.js
+++ b/xtends/statics/agent-report/index.js
@@ -12,48 +12,48 @@ Scene({
height: app.globalData.fragmentHeight,
form: {},
columns: [
- { key: 'catname', title: '品类', width: 100, fixed: 'left', align: 'center' },
- { key: 'product_title', width: 100, fixed: 'left', title: '结算重量(吨)' },
- { key: 'product_bar_code', title: '实收金额(元)', width: 100, },
- { key: 'quantity', width: 100, title: '代卖费(元)' }
+ { 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: 150, label: '代卖费(元)' }
],
data: [
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '187500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '187500.00', quantity: '2.500'},
+ {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'},
],
show: false
},
@@ -75,7 +75,7 @@ Scene({
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.setData({ height: app.globalData.fragmentHeight - 80, minDate, maxDate, vdate, vdateString })
+ this.setData({ height: app.globalData.fragmentHeight - 404, minDate, maxDate, vdate, vdateString })
this.fetchStatisticsInfo()
},
showCalendar: function(){
diff --git a/xtends/statics/agent-report/index.wxml b/xtends/statics/agent-report/index.wxml
index b3e754c..80893d6 100644
--- a/xtends/statics/agent-report/index.wxml
+++ b/xtends/statics/agent-report/index.wxml
@@ -1,20 +1,38 @@
+
代卖报表
-
+
- 出货信息
+ 代卖统计
{{vdateString}}
-
-
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 代卖重量(吨)
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 实收(元)
+
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 代卖费(元)
+
+
+
+
+
diff --git a/xtends/statics/gross-report/index.js b/xtends/statics/gross-report/index.js
index c8519a9..65b4400 100644
--- a/xtends/statics/gross-report/index.js
+++ b/xtends/statics/gross-report/index.js
@@ -12,48 +12,48 @@ Scene({
height: app.globalData.fragmentHeight,
form: {},
columns: [
- { key: 'catname', title: '品类', width: 100, fixed: 'left', align: 'center' },
- { key: 'product_title', width: 100, fixed: 'left', title: '采购金额(元)' },
- { key: 'product_bar_code', title: '销售金额(元)', width: 100, },
- { key: 'quantity', width: 80, title: '毛利(元)' }
+ { 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: [
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '187500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '187500.00', quantity: '2.500'},
+ {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'},
],
show: false
},
@@ -75,7 +75,7 @@ Scene({
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.setData({ height: app.globalData.fragmentHeight - 80, minDate, maxDate, vdate, vdateString })
+ this.setData({ height: app.globalData.fragmentHeight - 404, minDate, maxDate, vdate, vdateString })
this.fetchStatisticsInfo()
},
showCalendar: function(){
diff --git a/xtends/statics/gross-report/index.wxml b/xtends/statics/gross-report/index.wxml
index 26b1053..c6f4603 100644
--- a/xtends/statics/gross-report/index.wxml
+++ b/xtends/statics/gross-report/index.wxml
@@ -1,20 +1,39 @@
+
毛利报表
-
+
- 出货信息
+ 收支统计
{{vdateString}}
-
-
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总支出(元)
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总收入(元)
+
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总毛利(元)
+
+
+
+
+
+
diff --git a/xtends/statics/index/index.js b/xtends/statics/index/index.js
index 4aa3991..fcb7232 100644
--- a/xtends/statics/index/index.js
+++ b/xtends/statics/index/index.js
@@ -1,102 +1,151 @@
// xtends//statics/index/index.js
import Scene from '../../../pages/index/scene'
import uCharts from '../../libs/u-charts';
+import { getSummaryReport } from "../../../api/saas"
const math = require('../../../utils/math')
+import util from '../../../utils/util'
const app = getApp()
-var that;
-var canvaColumn = null;
-var windowWidth = 0;
+// var that;
+// var canvaColumn = null;
+// var windowWidth = 0;
Scene({
/**
* 页面的初始数据
*/
data: {
- cWidth: '',
- cHeight: '',
+ // cWidth: '',
+ // cHeight: '',
+ form1: {},
+ form2: {},
+ percent: 85,
+ show: false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- that = this
- windowWidth = wx.getSystemInfoSync().windowWidth
- this.data.cWidth = windowWidth - this.rpx2px(100)
- // math.divide
- this.data.cHeight = this.rpx2px(400)
- this.getServerData()
+ // that = this
+ // windowWidth = wx.getSystemInfoSync().windowWidth
+ // this.data.cWidth = windowWidth - this.rpx2px(100)
+ // // math.divide
+ // this.data.cHeight = this.rpx2px(400)
+ // this.getServerData()
+ wx.showLoading({ title: '加载中', mask: true })
+ var min = new Date()
+ min.setFullYear(min.getFullYear() - 1, min.getMonth(), min.getDate())
+ min.setHours(0, 0, 0)
+ var minDate = min.getTime()
+ var max = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
+ max.setHours(0, 0, 0)
+ var maxDate = max.getTime()
+ 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.form1.dimensionDateStart = util.formatDate(today, 'Y-M-D')
+ this.data.form1.dimensionDateEnd = util.formatDate(max, 'Y-M-D')
+ this.data.form2.startTime = util.formatDate(today, 'Y-M-D') + ' 00:00:00'
+ this.data.form2.endTime = util.formatDate(max, 'Y-M-D') + ' 00:00:00'
+ this.setData({ minDate, maxDate, vdate, vdateString })
+ this.fetchSummaryInfo(this.data.form1)
},
- rpx2px: function(rpx) {
- return rpx / 750 * windowWidth;
- },
- getServerData: function() {
- wx.request({
- url: 'https://www.ucharts.cn/data.json',
- success: function (res) {
- let Column = { categories: [], series: [] };
- Column.categories = res.data.data.Pie.categories;
- Column.series = res.data.data.Pie.series;
- // 自定义标签颜色和字体大小
- // Column.series[1].textColor = 'red';
- // Column.series[1].textSize = 18;
- that.showColumn("canvasColumn", Column);
- },
- fail: () => {
- console.log("请点击右上角【详情】，启用不校验合法域名");
- },
+ fetchSummaryInfo: function(form){
+ getSummaryReport(form).then(result => {
+ // this.setData({ })
+ wx.hideLoading()
+ }).catch(err => {
+ wx.hideLoading()
})
},
- showColumn(canvasId, chartData) {
- let ctx = wx.createCanvasContext(canvasId, this);
- canvaColumn = new uCharts({
- type: 'ring',
- context: ctx,
- // fontSize: 11,
- background: '#FFFFFF',
- pixelRatio: 1,
- // animation: true,
- // categories: chartData.categories,
- series: chartData.series,
- color: [ "#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc" ],
- dataLabel: true,
- width: that.data.cWidth,
- height: that.data.cHeight,
- legend: {
- show: true,
- position: "right",
- float: "center",
- padding: 5,
- margin: 5,
- fontSize: 13,
- fontColor: "#666666",
- lineHeight: 25,
- hiddenColor: "#CECECE",
- itemGap: 10
- },
- extra: {
- ring: {
- ringWidth: 30,
- centerColor: "#FFFFFF",
- activeOpacity: 0.5,
- activeRadius: 10,
- offsetAngle: 0,
- customRadius: 0,
- labelWidth: 15,
- border: true,
- borderWidth: 3,
- borderColor: "#FFFFFF",
- linearType: "none"
- }
- }
- });
+ showCalendar: function(e){
+ console.log(e.currentTarget.id)
+ this.setData({ show: true })
},
- touchColumn(e) {
- canvaColumn.showToolTip(e, {
- formatter: function (item) {
- console.log(item)
- return item.name + ':' + item.data
- }
- })
- }
+ onClose: function() {
+ this.setData({ show: false })
+ },
+ onSelect: function({detail}) {
+ 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.setData({ show: false, vdateString })
+ wx.showLoading({ title: '加载中', mask: true })
+ this.fetchStatisticsInfo()
+ },
+ // rpx2px: function(rpx) {
+ // return rpx / 750 * windowWidth;
+ // },
+ // getServerData: function() {
+ // wx.request({
+ // url: 'https://www.ucharts.cn/data.json',
+ // success: function (res) {
+ // let Column = { categories: [], series: [] };
+ // Column.categories = res.data.data.Pie.categories;
+ // Column.series = res.data.data.Pie.series;
+ // // 自定义标签颜色和字体大小
+ // // Column.series[1].textColor = 'red';
+ // // Column.series[1].textSize = 18;
+ // that.showColumn("canvasColumn", Column);
+ // },
+ // fail: () => {
+ // console.log("请点击右上角【详情】，启用不校验合法域名");
+ // },
+ // })
+ // },
+ // showColumn(canvasId, chartData) {
+ // let ctx = wx.createCanvasContext(canvasId, this);
+ // canvaColumn = new uCharts({
+ // type: 'ring',
+ // context: ctx,
+ // // fontSize: 11,
+ // background: '#FFFFFF',
+ // pixelRatio: 1,
+ // // animation: true,
+ // // categories: chartData.categories,
+ // series: chartData.series,
+ // color: [ "#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc" ],
+ // dataLabel: true,
+ // width: that.data.cWidth,
+ // height: that.data.cHeight,
+ // legend: {
+ // show: false,
+ // position: "right",
+ // float: "center",
+ // padding: 5,
+ // margin: 5,
+ // fontSize: 13,
+ // fontColor: "#666666",
+ // lineHeight: 25,
+ // hiddenColor: "#CECECE",
+ // itemGap: 10
+ // },
+ // extra: {
+ // ring: {
+ // ringWidth: 30,
+ // centerColor: "#FFFFFF",
+ // activeOpacity: 0.5,
+ // activeRadius: 10,
+ // offsetAngle: 0,
+ // customRadius: 0,
+ // labelWidth: 15,
+ // border: true,
+ // borderWidth: 3,
+ // borderColor: "#FFFFFF",
+ // linearType: "none"
+ // }
+ // }
+ // });
+ // },
+ // touchColumn(e) {
+ // canvaColumn.showToolTip(e, {
+ // formatter: function (item) {
+ // console.log(item)
+ // return item.name + ':' + item.data
+ // }
+ // })
+ // }
})
\ No newline at end of file
diff --git a/xtends/statics/index/index.json b/xtends/statics/index/index.json
index 6929d06..eebd097 100644
--- a/xtends/statics/index/index.json
+++ b/xtends/statics/index/index.json
@@ -3,6 +3,8 @@
"van-grid": "/components/grid/index",
"van-grid-item": "/components/grid-item/index",
"van-icon": "/components/icon/index",
+ "van-circle": "/components/circle/index",
+ "van-calendar": "/components/calendar/index",
"notification": "/pages/message/notification/index"
}
}
\ No newline at end of file
diff --git a/xtends/statics/index/index.wxml b/xtends/statics/index/index.wxml
index 8eef297..8e31970 100644
--- a/xtends/statics/index/index.wxml
+++ b/xtends/statics/index/index.wxml
@@ -4,82 +4,127 @@
智能报表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 收货统计
-
-
-
-
-
- 收货总重量
- 收货总金额
-
-
-
-
-
-
-
- 出货统计
-
- {{vdateString}}
-
-
-
-
-
-
- 收货重量
+
+
+
+
+
+ 收货报表
+ 核对收货数据
- {{formate.formateWeight(totalInfo.totalWeight || 0)}}吨
+
-
-
-
- 收货金额
+
+
+
+
+ 销售报表
+ 核对销售数据
- {{formate.formateAmount(totalInfo.totalMoney || 0)}}
+
-
-
-
-
-
- 收货重量
+
+
+
+
+ 毛利报表
+ 分析经营利润
- {{formate.formateWeight(totalInfo.totalWeight || 0)}}吨
+
-
-
-
- 收货金额
+
+
+
+
+ 代卖报表
+ 核对代卖数据
- {{formate.formateAmount(totalInfo.totalMoney || 0)}}
+
+
+
+
+
+
+
+
+ 收货统计
+
+
+ {{vdateString}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 收货合计(吨)
+ 1230.45
+
+
+ 场外收货(吨)
+
+ 1230.45
+
+
+ 收货总金额(元)
+ 1230.45
+
+
+ 场内收货(吨)
+
+ 1230.45
+
+
+
+
+ 销售统计
+
+
+ {{vdateString}}
+
+
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总出货重量(吨)
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总结算重量(吨)
+
+
+
+
+
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总出车数(车)
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 总结算金额(元)
+
+
+
+
+
diff --git a/xtends/statics/index/index.wxss b/xtends/statics/index/index.wxss
index 6230d44..f528fcd 100644
--- a/xtends/statics/index/index.wxss
+++ b/xtends/statics/index/index.wxss
@@ -8,4 +8,61 @@
width: 100%;
height: 400rpx;
background-color: #FFFFFF;
-}
\ No newline at end of file
+}
+
+.shanxing {
+ width: 200rpx;
+ height: 200rpx;
+ margin: 10rpx auto;
+ position: relative;
+ border-radius: 50%;
+ overflow: hidden;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.sx1, .sx2 {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 200rpx;
+ height: 200rpx;
+ clip: rect(0rpx, 100rpx, 200rpx, 0rpx);
+}
+
+.sx1 {
+ z-index: 1;
+}
+
+.sx2 {
+ z-index: 2;
+}
+
+.sx_t {
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 50%;
+ z-index: 3;
+ background: #fff;
+}
+
+.shanxing1 {
+ /* background: #FF222C; */
+ background-image: linear-gradient(269deg, #FF222C 0%, #FF691C 100%);
+}
+
+.shanxing1 .sx1, .shanxing1 .sx2 {
+ background: #007AFF;
+}
+
+.shanxing2 {
+ background: #007AFF;
+}
+
+.shanxing2 .sx1, .shanxing2 .sx2 {
+ /* background: #FF222C; */
+ background-image: linear-gradient(269deg, #FF222C 0%, #FF691C 100%);
+ transform: rotate(180deg);
+}
+
diff --git a/xtends/statics/purchase-report/index.js b/xtends/statics/purchase-report/index.js
index 1572d2f..81a3302 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 { getStatisticsInfo } from "../../../api/saas"
+import { getSummaryReport } from "../../../api/saas"
import util from '../../../utils/util'
const app = getApp()
@@ -12,48 +12,48 @@ Scene({
height: app.globalData.fragmentHeight,
form: {},
columns: [
- { key: 'catname', title: '品类', width: 100, fixed: 'left', align: 'center' },
- { key: 'product_title', width: 80, fixed: 'left', title: '重量(公斤)' },
- { key: 'product_bar_code', title: '金额(元)', width: 80, },
- { key: 'quantity', width: 100, title: '均价(元/公斤)' }
+ { 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: [
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '187500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '87500.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '35000.00', product_title: '187500.00', quantity: '2.500'},
+ {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'},
],
show: false
},
@@ -73,9 +73,9 @@ 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.setData({ height: app.globalData.fragmentHeight - 80, minDate, maxDate, vdate, vdateString })
+ 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 - 304, minDate, maxDate, vdate, vdateString })
this.fetchStatisticsInfo()
},
showCalendar: function(){
@@ -85,17 +85,17 @@ Scene({
this.setData({ show: false })
},
onSelect: function({detail}) {
+ wx.showLoading({ title: '加载中', mask: true })
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.setData({ show: false, vdateString })
- wx.showLoading({ title: '加载中', mask: true })
this.fetchStatisticsInfo()
},
fetchStatisticsInfo: function(){
- getStatisticsInfo(this.data.form).then(result => {
+ getSummaryReport(this.data.form).then(result => {
// this.setData({ })
wx.hideLoading()
}).catch(err => {
diff --git a/xtends/statics/purchase-report/index.wxml b/xtends/statics/purchase-report/index.wxml
index ec93ff8..29fc667 100644
--- a/xtends/statics/purchase-report/index.wxml
+++ b/xtends/statics/purchase-report/index.wxml
@@ -1,9 +1,10 @@
+
- 采购报表
+ 收货报表
-
+
出货信息
@@ -13,8 +14,17 @@
-
-
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 重量(公斤)
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 合计金额(元)
+
+
+
diff --git a/xtends/statics/sale-report/index.js b/xtends/statics/sale-report/index.js
index 4eccb8d..0149923 100644
--- a/xtends/statics/sale-report/index.js
+++ b/xtends/statics/sale-report/index.js
@@ -12,49 +12,49 @@ Scene({
height: app.globalData.fragmentHeight,
form: {},
columns: [
- { key: 'catname', title: '品类', width: 100, fixed: 'left', align: 'center' },
- { key: 'product_title', width: 90, fixed: 'left', title: '出货重量' },
- { key: 'product_bar_code', title: '结算重量', width: 90, },
- { key: 'quantity', width: 90, title: '结算均价' },
- { key: 'quantity', width: 90, title: '结算金额' }
+ { prop: 'datetime', width: 200, label: '品类', color: '#55C355' },
+ { prop: 'sign_in_time', width: 180, label: '出货重量(吨)' },
+ { prop: 'sign_out_time', width: 180, label: '结算重量(吨)' },
+ { prop: 'work_hour', width: 220, label: '结算均价(元/吨)' },
+ { prop: 'status', width: 180, label: '结算金额(元)' }
],
data: [
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '1870.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '870.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '870.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '875.00', quantity: '2.500'},
- {catname: '黄纸皮A级', product_bar_code: '2400.00', product_title: '1875.00', quantity: '2.500'},
+ {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'},
],
show: false
},
@@ -76,7 +76,7 @@ Scene({
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.setData({ height: app.globalData.fragmentHeight - 80, minDate, maxDate, vdate, vdateString })
+ this.setData({ height: app.globalData.fragmentHeight - 404, minDate, maxDate, vdate, vdateString })
this.fetchStatisticsInfo()
},
showCalendar: function(){
diff --git a/xtends/statics/sale-report/index.wxml b/xtends/statics/sale-report/index.wxml
index 1f3d08a..364ccca 100644
--- a/xtends/statics/sale-report/index.wxml
+++ b/xtends/statics/sale-report/index.wxml
@@ -1,20 +1,41 @@
+
销售报表
-
+
- 出货信息
+ 销售统计
{{vdateString}}
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 出货重量(吨)
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 结算重量(吨)
+
+
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 出货车数(车)
+
+
+ {{formate.formateWeight(totalInfo.totalWeight || 0)}}
+ 金额(元)
+
+
-
+