~jiangyouyao/beauty-erp.git

parent: e04735fb | patch | commit | ignore whitespace

jyy

2021-01-28 5dee07d9b58619142e18e1182db521ebaab15409

Merge branch 'api' into hive2.0

2 files modified

	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html	1 ●●●●● patch \| view \| raw \| blame \| history

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

@@ -294,8 +294,10 @@
                    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,

                }
            },
            search:function(){

 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,
                }

			@@ -294,8 +294,10 @@
			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,

			}
			},
			search:function(){

			@@ -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,
			}