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

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

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品名" prop="name">
-						<el-input v-model="form.name" placeholder="请输入商品名" />
+						<el-input v-model="form.name" placeholder="请输入商品名" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -14,27 +14,27 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品封面图片" prop="cover">
-						<upload-imgs v-model="form.cover" />
+						<upload-imgs v-model="form.cover" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品识别图片" prop="pic">
-						<upload-imgs v-model="form.pic" />
+						<upload-imgs v-model="form.pic" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="口味" prop="specsTaste">
-						<el-input v-model="form.specsTaste" placeholder="" />
+						<el-input v-model="form.specsTaste" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="容量" prop="specsCapacity">
-						<el-input v-model="form.specsCapacity" placeholder="" />
+						<el-input v-model="form.specsCapacity" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="重量" prop="specsWeight">
-						<el-input v-model="form.specsWeight" placeholder="" />
+						<el-input v-model="form.specsWeight" :disabled="form.skuType == '0'" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -66,7 +66,7 @@
 							<span>是否标品</span>
 							<tip content="选择是,该商品将会根据商品图片建模" />
 						</template>
-						<el-radio-group v-model="form.isDefault">
+						<el-radio-group v-model="form.isDefault" :disabled="form.skuType == '0'">
 							<el-radio v-for="v in yes_no_type" :key="v.value" :label="v.value" border>
 								{{ v.label }}
 							</el-radio>
@@ -98,7 +98,7 @@ const loading = ref(false)
 // 定义字典
 const { yes_no_type } = useDict("yes_no_type")
 // 提交表单数据
-const form = reactive({
+const form = reactive<any>({
 	id: "",
 	hardId: "",
 	spuCategoryId: "",
@@ -173,7 +173,7 @@ const gethardSpuData = (id: string) => {
 	hardSpu
 		.getObj(id)
 		.then((res: any) => {
-			Object.assign(form, res.data, { price: displayPrice(res.data.price, "", 0) })
+			Object.assign(form, res.data, { price: Number(displayPrice(res.data.price, "", 0)) })
 		})
 		.finally(() => {
 			loading.value = false

src/views/hard/hard-spu/index.vue

@@ -97,11 +97,18 @@
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" fixed="right" width="150">
-					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardSpu_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+					<template #default="{ row }">
+						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardSpu_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'hard_hardSpu_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							v-if="!(row.skuType == '0')"
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'hard_hardSpu_del'"
+							@click="handleDelete([row.id])"
+						>
 							删除
 						</el-button>
 					</template>