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

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

@@ -158,7 +158,7 @@ const form = reactive({
 	businessTime: "",
 	addressDes: "",
 	sort: 0,
-	supType: "10",
+	supType: "",
 	cooperationStatus: "1",
 	parentId: "",
 	discountsPrice: "",
@@ -222,7 +222,7 @@ watch(
 	() => form.types,
 	(newVal) => {
 		if (newVal != "2") {
-			form.supType = "10"
+			form.supType = ""
 			form.cooperationStatus = "1"
 			form.parentId = ""
 			form.discountsPrice = ""
@@ -241,6 +241,11 @@ const onSubmit = async () => {
 		cooperationStatus: form.types == "2" && form.supType == "10" ? null : form.cooperationStatus,
 		parentId: form.types == "2" && form.supType == "10" ? -1 : form.parentId,
 	}
+
+	if (_pa.parentId == "") {
+		_pa.parentId = -1
+	}
+
 	try {
 		loading.value = true
 		form.id ? await putObj(_pa) : await addObj(_pa)

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" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '2' }" />
 					</el-form-item>
 				</el-col>
 
@@ -35,9 +35,7 @@
 				<el-col :span="24" class="mb20">
 					<el-form-item label="状态" prop="status">
 						<el-radio-group v-model="form.status">
-							<el-radio :label="item.value" v-for="(item, index) in status" border :key="index"
-								>{{ item.label }}
-							</el-radio>
+							<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
@@ -55,7 +53,7 @@
 <script setup lang="ts" name="SupermarketBrandDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/src/api/supermarketerp/supermarketBrand"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketBrand"
 import { rule } from "/@/utils/validate"
 const emit = defineEmits(["refresh"])
 

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" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '2' }" />
 					</el-form-item>
 				</el-col>