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

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

@@ -21,6 +21,9 @@
 					<el-form-item style="width: 300px" label="用餐时间段" prop="hourType">
 						<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 					</el-form-item>
+					<el-form-item style="width: 300px" label="订单状态" prop="orderStatus">
+						<dict-select v-model="state.queryForm.orderStatus" dict-code="hard_order_status" />
+					</el-form-item>
 					<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
 						<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
 					</el-form-item>