fix:硬件核销流程

src/views/hard/hard-manager/form.vue

@@ -14,9 +14,9 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" class="mb20">
+				<el-col v-if="false" :span="24" class="mb20">
-					<el-form-item label="分组" prop="groupId">
+					<el-form-item label="分组" prop="hardGroupId">
-						<select-hard-group v-model="form.groupId" placeholder="分组" />
+						<select-hard-group v-model="form.hardGroupId" placeholder="分组" />
 					</el-form-item>
 				</el-col>
 
@@ -55,6 +55,7 @@ const form = reactive({
 	merchantId: "",
 	deptId: "",
 	name: "",
+	hardGroupId: "",
 	type: "",
 })
 
@@ -62,7 +63,7 @@ const form = reactive({
 const dataRules = ref({
 	name: [{ required: true, message: "设备名不能为空", trigger: "blur" }],
 	merchantId: [{ required: true, message: "商户不能为空", trigger: "change" }],
-	groupId: [{ required: true, message: "分组不能为空", trigger: "change" }],
+	hardGroupId: [{ required: true, message: "分组不能为空", trigger: "change" }],
 	type: [{ required: true, message: "设备类型不能为空", trigger: "change" }],
 })
 

src/views/wallet/mch-manage/form.vue

@@ -14,6 +14,12 @@
 					</el-form-item>
 				</el-col>
 
+				<el-col :span="24" class="mb20">
+					<el-form-item label="硬件分组" prop="hardGroupId">
+						<select-hard-group v-model="form.hardGroupId" />
+					</el-form-item>
+				</el-col>
+
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户类型" prop="merchantType">
 						<el-checkbox-group v-model="form.merchantType">
@@ -105,6 +111,7 @@ const form = reactive({
 	jobStartTime: "",
 	jobEndTime: "",
 	rangeDate: [],
+	hardGroupId: "",
 })
 
 // 定义校验规则
@@ -116,6 +123,7 @@ const dataRules = ref({
 	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
 	deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
 	merchantType: [{ required: true, message: "请选择商户类型", trigger: "change" }],
+	hardGroupId: [{ required: true, message: "请选择硬件分组", trigger: "change" }],
 })
 
 // 打开弹窗