Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/hard/hard-order/index.vue

@@ -295,7 +295,7 @@ const resetQuery = () => {
 	selectObjs.value = []
 	state.queryForm.deptId = ""
 	state.queryForm.deptIds = []
-	draggableDepTreeRef.value.resetData()
+	// draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 

src/views/wallet/wallet-xf/index.vue

@@ -17,6 +17,9 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
+								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
 							</el-form-item>