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

src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue

@@ -93,7 +93,7 @@
 				</template>
 			</vxe-column>
 			<vxe-column field="costPrice" title="成本价(元)" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-				<template #edit="{ row }">
+				<template #costPriceDefault="{ row }">
 					<el-input-number v-model="row.costPrice" controls-position="right" :min="0" :precision="2" />
 				</template>
 			</vxe-column>
@@ -124,14 +124,14 @@ const supermarketUnitEntityList = defineModel("supermarketUnitEntityList", {
 const editableTableRef = ref()
 const validRules = {
 	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
-	spec: [{ required: true, message: "规格不能为空", trigger: "blur" }],
+	// spec: [{ required: true, message: "规格不能为空", trigger: "blur" }],
 	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
 	status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
 	packageNum: [{ required: true, message: "内装数不能为空", trigger: "blur" }],
 	retailPrice: [{ required: true, message: "零售价不能为空", trigger: "blur" }],
 	purchasePrice: [{ required: true, message: "进价不能为空", trigger: "blur" }],
 	promotionPrice: [{ required: true, message: "促销价不能为空", trigger: "blur" }],
-	costPrice: [{ required: true, message: "成本价不能为空", trigger: "blur" }],
+	// costPrice: [{ required: true, message: "成本价不能为空", trigger: "blur" }],
 }
 
 // 底部表格行新增

src/views/supermarketerp/supermarketSpu/form.vue

@@ -4,11 +4,11 @@
 			<el-tabs v-model="tabPaneActiveName" @tab-change="handleTabChange">
 				<el-tab-pane label="基础信息" name="基础信息" style="overflow-y: auto; height: 60vh">
 					<el-row>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="商户" prop="merchantId">
-								<select-mch v-model="form.merchantId" />
-							</el-form-item>
-						</el-col>
+<!--						<el-col :span="12" class="mb20">-->
+<!--							<el-form-item label="商户" prop="merchantId">-->
+<!--								<select-mch v-model="form.merchantId" />-->
+<!--							</el-form-item>-->
+<!--						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="货号" prop="productCode">
 								<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
@@ -216,8 +216,8 @@ const dataRules = {
 	productName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
 	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
 	categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }],
-	brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
-	picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
+	// brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
+	// picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
 	status: [{ required: true, message: "请选择商品状态", trigger: "blur" }],
 	supplierId: [{ required: true, message: "请选择货商", trigger: "blur" }],
 	smErpUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],

src/views/supermarketerp/supermarketSpu/index.vue

@@ -73,11 +73,11 @@
 						{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
 					</template>
 				</el-table-column>
-				<el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
+<!--				<el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
 					<template #default="scope">
 						{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
 					</template>
-				</el-table-column>
+				</el-table-column>-->
 				<el-table-column prop="picUrl" label="封面图" width="100">
 					<template #default="scope">
 						<preview-image :src="scope.row.picUrl" />