~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-07 382c853bb36bc2521818058c788b6fdf48d7f684

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html

@@ -269,6 +269,7 @@
                    queryKey:_this.form.queryKey,
                    startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                    endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
                    shopId:_this.form.shopId,
                    order:_this.form.order,
                    sort:_this.form.sort,
                }

			@@ -269,6 +269,7 @@
			queryKey:_this.form.queryKey,
			startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
			endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
			shopId:_this.form.shopId,
			order:_this.form.order,
			sort:_this.form.sort,
			}