11

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

@@ -13,8 +13,8 @@
 							<el-form-item style="width: 300px" label="商户类型" prop="merchantType">
 								<dict-select v-model="state.queryForm.merchantType" dict-code="merchant_type" />
 							</el-form-item>
-							<el-form-item style="width: 300px" label="商户" prop="mchIds">
-								<select-mch v-model="state.queryForm.mchIds" :apiParams="{ parentIsNull: false }" />
+							<el-form-item style="width: 300px" label="商户" prop="merchantId">
+								<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false }" />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="设备类型" prop="hardTypeCode">
 								<dict-select v-model="state.queryForm.hardTypeCode" dict-code="hard_type" />
@@ -277,9 +277,12 @@ const transactionListRef = ref()
 const adminRefundDailogRef = ref()
 const tabList = ref<any>([{}])
 const activeName = ref(null)
+const draggableDepTreeRef = ref()
+
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
+
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
@@ -306,7 +309,7 @@ const resetQuery = () => {
 	selectObjs.value = []
 	// state.queryForm.deptId = ""
 	state.queryForm.userDeptIds = []
-	// draggableDepTreeRef.value.resetData()
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }