Merge remote-tracking branch 'origin/master'
This commit is contained in:
zjf committed
commit
7af77692f6
1 file changed
+40
-41
@@ -110,40 +110,40 @@
|
||||
<el-col :span="12" class="mb20 pr-10">
|
||||
<el-form-item label="货商" prop="supplierId">
|
||||
<el-select v-model="form.supplierId" placeholder="请选择货商">
|
||||
<el-option v-for="item in supplierOptions" :key="item.supplierId" :label="item.supplierName" :value="item.supplierId" />
|
||||
<el-option v-for="item in supplierOptions" :key="item?.id" :label="item?.typeName" :value="item?.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="会员价1" prop="memberPrice1">-->
|
||||
<!-- <el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="会员价2" prop="memberPrice2">-->
|
||||
<!-- <el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="会员价3" prop="memberPrice3">-->
|
||||
<!-- <el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="批发价1" prop="wholesalePrice1">-->
|
||||
<!-- <el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="批发价2" prop="wholesalePrice2">-->
|
||||
<!-- <el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="批发价3" prop="wholesalePrice3">-->
|
||||
<!-- <el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="会员价1" prop="memberPrice1">-->
|
||||
<!-- <el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="会员价2" prop="memberPrice2">-->
|
||||
<!-- <el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="会员价3" prop="memberPrice3">-->
|
||||
<!-- <el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="批发价1" prop="wholesalePrice1">-->
|
||||
<!-- <el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="批发价2" prop="wholesalePrice2">-->
|
||||
<!-- <el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="12" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="批发价3" prop="wholesalePrice3">-->
|
||||
<!-- <el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<el-col :span="12" class="mb20 pr-10">
|
||||
<el-form-item label="促销价" prop="promotionPrice">
|
||||
<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>
|
||||
@@ -156,11 +156,11 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="24" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="商品简介" prop="introduction">-->
|
||||
<!-- <el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="24" class="mb20 pr-10">-->
|
||||
<!-- <el-form-item label="商品简介" prop="introduction">-->
|
||||
<!-- <el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<el-col :span="24" class="mb20 pr-10">
|
||||
<el-form-item label="商品详情" prop="description">
|
||||
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
|
||||
@@ -207,9 +207,7 @@
|
||||
import { useDict } from '/@/hooks/dict';
|
||||
import { useMessage } from '/@/hooks/message';
|
||||
import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu';
|
||||
import { getObj as getSupermarketUnit } from '/@/api/supermarket/supermarketUnit';
|
||||
import { getObj as getSupermarketAuxiliaryCode } from '/@/api/supermarket/supermarketAuxiliaryCode';
|
||||
import { fetchList } from '/@/api/supermarketerp/smErpSupplier';
|
||||
import { getSupplierTypeOptions } from '/@/api/supermarketerp/smErpSupplier';
|
||||
import { rule } from '/@/utils/validate';
|
||||
import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
|
||||
import supermarketUnit from './components/supermarketUnit/index.vue';
|
||||
@@ -334,8 +332,8 @@ const openDialog = async (id: string) => {
|
||||
// 获取货商选项
|
||||
if (supplierOptions.value.length <= 0) {
|
||||
try {
|
||||
const res = await fetchList();
|
||||
supplierOptions.value = res.data.records;
|
||||
const res = await getSupplierTypeOptions();
|
||||
supplierOptions.value = res.data;
|
||||
} catch (error) {
|
||||
supplierOptions.value = [];
|
||||
}
|
||||
@@ -352,6 +350,7 @@ const onSubmit = async () => {
|
||||
console.log(form);
|
||||
|
||||
const valid = await dataFormRef.value.validate().catch(() => {});
|
||||
if (!valid) useMessage().warning('基础信息必填项未填写完整');
|
||||
if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0) useMessage().warning('请添加包装单位');
|
||||
if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0) useMessage().warning('请添加辅助条码');
|
||||
if (!valid) return false;
|
||||
|
||||
Reference in new issue
Block a user