From be7daa58eee1911ba392c122c2d1a0beeaaac985 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Apr 2025 14:59:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=99=BA=E8=83=BD=E6=9F=9C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=89=8B=E5=8A=A8=E4=B8=8A=E6=9E=B6=20feat:=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hard/hard-spu-repertory.ts          | 4 ++--
 src/views/hard/hard-order/index.vue         | 2 +-
 src/views/hard/hard-spu-repertory/index.vue | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/hard/hard-spu-repertory.ts b/src/api/hard/hard-spu-repertory.ts
index 4519dc6..6b65e91 100644
--- a/src/api/hard/hard-spu-repertory.ts
+++ b/src/api/hard/hard-spu-repertory.ts
@@ -1,8 +1,8 @@
 import request from "/@/utils/request"
 
-export function select(query?: Object) {
+export function pageJoin(query?: Object) {
 	return request({
-		url: "/hard/hard-spu-repertory/select",
+		url: "/hard/hard-spu-repertory/page-join",
 		method: "get",
 		params: query,
 	})
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 0399ef1..01d6d7e 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -10,7 +10,7 @@
 						<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" />
+						<select-mch v-model="state.queryForm.mchIds" :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" />
diff --git a/src/views/hard/hard-spu-repertory/index.vue b/src/views/hard/hard-spu-repertory/index.vue
index 4a2f989..839ccc1 100644
--- a/src/views/hard/hard-spu-repertory/index.vue
+++ b/src/views/hard/hard-spu-repertory/index.vue
@@ -67,7 +67,7 @@
 
 <script setup lang="ts" name="systemHardSpuRepertory">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/hard/hard-spu-repertory"
+import * as hardSpuRepertory from "/@/api/hard/hard-spu-repertory"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
@@ -86,7 +86,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
-	pageList: fetchList,
+	pageList: hardSpuRepertory.pageJoin,
 })
 
 //  table hook
@@ -121,7 +121,7 @@ const handleDelete = async (ids: string[]) => {
 	}
 
 	try {
-		await delObjs(ids)
+		await hardSpuRepertory.delObjs(ids)
 		getDataList()
 		useMessage().success("删除成功")
 	} catch (err: any) {