超市商户选择修复

src/views/supermarket/smSpu/form.vue

@@ -2,6 +2,12 @@
 	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
 		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
 			<el-row :gutter="24">
+				<el-col :span="14" class="mb20">
+					<el-form-item label="商户" prop="merchantId">
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '3' }" />
+					</el-form-item>
+				</el-col>
+
 				<el-col :span="12" class="mb20">
 					<el-form-item label="库存商品" prop="erpSpuId">
 						<el-input
@@ -138,6 +144,7 @@ const spuSelectDialogVisible = ref<boolean>(false)
 
 // 提交表单数据
 const form = reactive({
+	merchantId: "",
 	id: "",
 	erpSpuId: "",
 	description: "<p></p>",
@@ -152,8 +159,8 @@ const form = reactive({
 
 // 定义校验规则
 const dataRules = ref({
-	erpSpuId: [{ required: true, message: "强选择库存商品", trigger: "change" }],
+	merchantId: [{ required: true, message: "请选择商户", trigger: "blur" }],
-	// sliderPicUrls: [{ required: true, message: "请上传轮播图", trigger: "blur" }],
+	erpSpuId: [{ required: true, message: "请选择库存商品", trigger: "change" }],
 })
 
 // 打开弹窗

src/views/supermarketerp/components/select-dialog.vue

@@ -27,7 +27,7 @@
 			@row-click="rowClick"
 			:row-style="{ cursor: 'pointer' }"
 		>
-			<el-table-column type="selection" width="50" fixed="left" align="center" />
+			<el-table-column type="selection" width="50" reserve-selection fixed="left" align="center" />
 			<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
 			<el-table-column prop="productName" label="商品名称" min-width="150px" align="center" show-overflow-tooltip />
 			<el-table-column prop="picUrl" label="封面图" align="center" show-overflow-tooltip>

src/views/supermarketerp/supermarketBrand/form.vue

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" :apiParams="{ types: '2' }" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '3' }" />
 					</el-form-item>
 				</el-col>
 

src/views/supermarketerp/supermarketCategory/form.vue

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" :apiParams="{ types: '2' }" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '3' }" />
 					</el-form-item>
 				</el-col>