Commit 637a4d64 authored by 邓春圆's avatar 邓春圆

所属国家必填

parent 0eb4ad01
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('快递')" prop="expressId"> <el-form-item :label="$t('快递')" prop="expressId">
<!-- <el-input v-model="form.expressId" placeholder="请输入快递ID" /> --> <!-- <el-input v-model="form.expressId" placeholder="请输入快递ID" /> -->
<el-select v-model="form.expressId"> <el-select v-model="form.expressId" style="width: 100%">
<el-option v-for="item in expressList" :value="item.id+''" :label="item.companyName" :key="item.id"/> <el-option v-for="item in expressList" :value="item.id+''" :label="item.companyName" :key="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('所属目的国家')" prop="country"> <el-form-item :label="$t('所属目的国家')" prop="countryId">
<el-select filterable clearable v-model="form.countryId" :placeholder="$t('请选择国家')"> <el-select style="width: 100%" filterable clearable v-model="form.countryId" :placeholder="$t('请选择国家')">
<el-option v-for="dict in countryList" <el-option v-for="dict in countryList"
:key="dict.id" :label="$l(dict,'title')" :value="parseInt(dict.id)"/> :key="dict.id" :label="$l(dict,'title')" :value="parseInt(dict.id)"/>
</el-select> </el-select>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="可出商品特性" prop="attrId"> <el-form-item label="可出商品特性" prop="attrId">
<el-select multiple v-model="form.attrId"> <el-select style="width: 100%" multiple v-model="form.attrId">
<el-option v-for="(item, index) in attrList" :value="item.id" :label="$l(item, 'attrName')"></el-option> <el-option v-for="(item, index) in attrList" :value="item.id" :label="$l(item, 'attrName')"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="渠道泡重比例" prop="attrId"> <el-form-item label="渠道泡重比例" prop="attrId">
<el-input v-model.number="form.bubbleWeightRatio" style="width: 200px"> <el-input v-model.number="form.bubbleWeightRatio" style="width: 100%">
<template #suffix> <template #suffix>
<span>%</span> <span>%</span>
</template> </template>
...@@ -135,18 +135,25 @@ ...@@ -135,18 +135,25 @@
<!-- </packaging-type>--> <!-- </packaging-type>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<el-form-item :label="$t('备注-中文')" prop="remarksZh"> <el-row :gutter="20">
<el-input <el-col :span="12"> <el-form-item :label="$t('备注-中文')" prop="remarksZh">
v-model="form.remarksZh" <el-input
:placeholder="$t('请输入备注-中文')" v-model="form.remarksZh"
/> :placeholder="$t('请输入备注-中文')"
</el-form-item> />
<el-form-item :label="$t('备注-英文')" prop="remarksEn"> </el-form-item></el-col>
<el-input </el-row>
v-model="form.remarksEn" <el-row :gutter="20">
:placeholder="$t('请输入备注-英文')" <el-col :span="12">
/> <el-form-item :label="$t('备注-英文')" prop="remarksEn">
</el-form-item> <el-input
v-model="form.remarksEn"
:placeholder="$t('请输入备注-英文')"
/>
</el-form-item></el-col>
</el-row>
<!-- <el-form-item label="状态(0:禁用 1:启用)" prop="status"> <!-- <el-form-item label="状态(0:禁用 1:启用)" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio label="1">{{ $t('请选择字典生成') }}</el-radio> <el-radio label="1">{{ $t('请选择字典生成') }}</el-radio>
...@@ -222,7 +229,8 @@ export default { ...@@ -222,7 +229,8 @@ export default {
internalNameEn: {required: true, message: '请输入内部英文名称', trigger: 'blur'}, internalNameEn: {required: true, message: '请输入内部英文名称', trigger: 'blur'},
typeNumber: {required: true, message: '请输入编码类型', trigger: 'blur'}, typeNumber: {required: true, message: '请输入编码类型', trigger: 'blur'},
code: {required: true, message: '请输入简码', trigger: 'blur'}, code: {required: true, message: '请输入简码', trigger: 'blur'},
attrId: {required: true, message: '请选择可出商品特性', trigger: 'blur'} attrId: {required: true, message: '请选择可出商品特性', trigger: 'blur'},
countryId: {required: true, message: '请选择国家', trigger: 'blur'}
}, },
expressList: [], expressList: [],
warehouseList: [], warehouseList: [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment