提交 6a61727d authored 作者: huaxinzhu's avatar huaxinzhu

fix-bug

上级 f1ced1da
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
<el-input v-model.trim="goodsInfoForm.conversion_unit" placeholder="请输入换算关系都数量值" style="width:420px;"></el-input> <el-input v-model.trim="goodsInfoForm.conversion_unit" placeholder="请输入换算关系都数量值" style="width:420px;"></el-input>
<span class="tip-span ml20">1包装单位=n计量单位,如:1箱=10个,请填写数字10</span> <span class="tip-span ml20">1包装单位=n计量单位,如:1箱=10个,请填写数字10</span>
</el-form-item> </el-form-item>
<el-form-item label="商品产地:" prop="producing_area_id"> <el-form-item label="商品产地:" prop="producing_area_id_list">
<el-cascader ref="producing_area" v-model.trim="goodsInfoForm.producing_area_id" :props="areaProps" placeholder="请选择" <el-cascader ref="producing_area" v-model.trim="goodsInfoForm.producing_area_id_list" :props="areaProps" placeholder="请选择"
style="width:420px;" size="mini" @change="matchIdName('producing_area')"> style="width:420px;" size="mini" @change="matchIdName('producing_area')">
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="商品发货地:" prop="deliver_area_id"> <el-form-item label="商品发货地:" prop="deliver_area_id_list">
<el-cascader ref="deliver_area" v-model.trim="goodsInfoForm.deliver_area_id" :props="areaProps" placeholder="请选择" <el-cascader ref="deliver_area" v-model.trim="goodsInfoForm.deliver_area_id_list" :props="areaProps" placeholder="请选择"
style="width:420px;" size="mini" @change="matchIdName('deliver_area')"> style="width:420px;" size="mini" @change="matchIdName('deliver_area')">
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
...@@ -285,9 +285,9 @@ ...@@ -285,9 +285,9 @@
goods_des: '', // 商品标签 goods_des: '', // 商品标签
goods_name: '', // 商品标题 goods_name: '', // 商品标题
category_id: '', category_id: '',
producing_area_id: '', // 产地id producing_area_id_list: '', // 产地id
producing_area: '', // 产地name producing_area: '', // 产地name
deliver_area_id: '', // 发货地id deliver_area_id_list: '', // 发货地id
deliver_area: '', // 发货地name deliver_area: '', // 发货地name
goods_brand: '', // 品牌 goods_brand: '', // 品牌
brand_id: '', // 品牌id brand_id: '', // 品牌id
...@@ -314,8 +314,8 @@ ...@@ -314,8 +314,8 @@
brand_id: [{ required: true, message: '请选择商品品牌', trigger: 'change' }], brand_id: [{ required: true, message: '请选择商品品牌', trigger: 'change' }],
ssfl: [{ required: true, message: '请选择商品税收分类', trigger: 'change' }], ssfl: [{ required: true, message: '请选择商品税收分类', trigger: 'change' }],
// goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}], // goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
producing_area_id:[{required: true, message: '请选择商品产地', trigger: 'change'}], producing_area_id_list:[{required: true, message: '请选择商品产地', trigger: 'change'}],
deliver_area_id: [{ required: true, message: '请选择商品发货地', trigger: 'change' }], deliver_area_id_list: [{ required: true, message: '请选择商品发货地', trigger: 'change' }],
// metering_unit: [{ required: true, message: '商品单位不能为空', trigger: 'change' }], // metering_unit: [{ required: true, message: '商品单位不能为空', trigger: 'change' }],
goods_brand: [{ required: true, message: '请选择商品品牌', trigger: 'change' }], goods_brand: [{ required: true, message: '请选择商品品牌', trigger: 'change' }],
imgs: [{ required: true, message: '请上传商品图片', validator: categoryIdCheck }] imgs: [{ required: true, message: '请上传商品图片', validator: categoryIdCheck }]
......
...@@ -218,9 +218,9 @@ ...@@ -218,9 +218,9 @@
metering_unit: res.data.metering_unit !== 0 ? res.data.metering_unit : "",// 计量单位, 三目兼容老数据 metering_unit: res.data.metering_unit !== 0 ? res.data.metering_unit : "",// 计量单位, 三目兼容老数据
packaging_unit: res.data.packaging_unit !== 0 ? res.data.packaging_unit : "",// 包装单位 packaging_unit: res.data.packaging_unit !== 0 ? res.data.packaging_unit : "",// 包装单位
conversion_unit: res.data.conversion_unit, // 换算关系 conversion_unit: res.data.conversion_unit, // 换算关系
producing_area_id: "", // 产地的idlist producing_area_id_list: "", // 产地的idlist
producing_area: res.data.producing_area, // 产地中文名称 producing_area: res.data.producing_area, // 产地中文名称
deliver_area_id: "", // 发货地的idlist deliver_area_id_list: "", // 发货地的idlist
deliver_area: res.data.deliver_area, // 发货地中文名称 deliver_area: res.data.deliver_area, // 发货地中文名称
tax_rate: res.data.tax_rate,// 税率 tax_rate: res.data.tax_rate,// 税率
goods_brand: res.data.goods_brand, // 品牌 goods_brand: res.data.goods_brand, // 品牌
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
// 产地 // 产地
let producing_area_list = res.data.producing_area_list let producing_area_list = res.data.producing_area_list
if (Array.isArray(producing_area_list) && producing_area_list.length > 0) { if (Array.isArray(producing_area_list) && producing_area_list.length > 0) {
this.goodsinfodata.producing_area_id = producing_area_list.map((item)=> { this.goodsinfodata.producing_area_id_list = producing_area_list.map((item)=> {
return item.id return item.id
}); });
} }
...@@ -252,12 +252,12 @@ ...@@ -252,12 +252,12 @@
// 发货地 // 发货地
let deliver_area_list = res.data.deliver_area_list let deliver_area_list = res.data.deliver_area_list
if (Array.isArray(deliver_area_list) && deliver_area_list.length > 0) { if (Array.isArray(deliver_area_list) && deliver_area_list.length > 0) {
this.goodsinfodata.deliver_area_id = deliver_area_list.map((item)=> { this.goodsinfodata.deliver_area_id_list = deliver_area_list.map((item)=> {
return item.id return item.id
}); });
} }
console.log(260,this.goodsinfodata.producing_area_id,this.goodsinfodata.deliver_area_id) // console.log(260,this.goodsinfodata.producing_area_id_list,this.goodsinfodata.deliver_area_id_list)
// 价格库存, 售价由规格决定 // 价格库存, 售价由规格决定
if(res.data.specs && res.data.specs.length > 0) { if(res.data.specs && res.data.specs.length > 0) {
...@@ -676,9 +676,9 @@ ...@@ -676,9 +676,9 @@
} }
// 产地 // 产地
spxxData.producing_area_id = spxxData.producing_area_id[spxxData.producing_area_id.length - 1] spxxData["producing_area_id"] = spxxData.producing_area_id_list[spxxData.producing_area_id_list.length - 1]
// 发货地 // 发货地
spxxData.deliver_area_id = spxxData.deliver_area_id[spxxData.deliver_area_id.length - 1] spxxData["deliver_area_id"] = spxxData.deliver_area_id_list[spxxData.deliver_area_id_list.length - 1]
// 发货地数据处理,预留 // 发货地数据处理,预留
// for(let ai = 0; ai < areaOptions.length; ai++) { // for(let ai = 0; ai < areaOptions.length; ai++) {
// if ( Number(ssffData.deliver_area) === Number(areaOptions[ai].id) ) { // if ( Number(ssffData.deliver_area) === Number(areaOptions[ai].id) ) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论