Skip to content

E
ElectricitySheep
Commit 3aed8cd8 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent ab8989f2
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 203 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ 3aed8cd8
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<el-input v-model="addMsg.Name" size="small" placeholder="请输入内容" maxlength="100" show-word-limit> <el-input v-model="addMsg.Name" size="small" placeholder="请输入内容" maxlength="100" show-word-limit>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品副标题" > <el-form-item label="商品副标题">
<el-input v-model="addMsg.SubName" size="small" placeholder="请输入内容" maxlength="100" show-word-limit> <el-input v-model="addMsg.SubName" size="small" placeholder="请输入内容" maxlength="100" show-word-limit>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
第一张图片为缩略图,其它图片为轮播图,建议像素750*750,最多支持上传9张 第一张图片为缩略图,其它图片为轮播图,建议像素750*750,最多支持上传9张
</p> </p>
<!-- <div flex="dir:left"> <!-- <div flex="dir:left">
<div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'" <div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'"
style="margin-right: 20px; position: relative; "> style="margin-right: 20px; position: relative; ">
<div class="colapp-image" :style="{ <div class="colapp-image" :style="{
...@@ -84,25 +84,26 @@ ...@@ -84,25 +84,26 @@
+ 添加图片 + 添加图片
</div> </div>
</div> --> </div> -->
<div class="nav_Main"> <div class="nav_Main">
<div class="nav_IconContent"> <div class="nav_IconContent">
<draggable v-model="addMsg.CarouselImageList"> <draggable v-model="addMsg.CarouselImageList">
<div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'" <div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'"
style="margin-right: 20px; position: relative; "> style="margin-right: 20px; position: relative; ">
<div class="colapp-image" :style="{ <div class="colapp-image" :style="{
backgroundImage: 'url(' + item.Path + ')' backgroundImage: 'url(' + item.Path + ')'
}"></div> }"></div>
<el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close" <el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close"
circle></el-button> circle></el-button>
</div> </div>
</draggable> </draggable>
</div> </div>
<div @click="openChangeDig(1)" v-if="addMsg.CarouselImageList.length<9" class="add-image-btn 2222"> <div @click="openChangeDig(1)" v-if="addMsg.CarouselImageList.length<9"
+ 添加图片 class="add-image-btn 2222">
</div> + 添加图片
</div> </div>
</div>
</el-form-item> </el-form-item>
<el-form-item label="商品视频"> <el-form-item label="商品视频">
...@@ -154,6 +155,16 @@ ...@@ -154,6 +155,16 @@
:inactive-value="2"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="自动上架时间" style="display:none;">
<el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="自动下架时间" style="display:none;">
<el-date-picker size="small" v-model="addMsg.DownDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
...@@ -204,8 +215,9 @@ ...@@ -204,8 +215,9 @@
</el-form-item> </el-form-item>
<!-- 判断是开启了粉象返佣 --> <!-- 判断是开启了粉象返佣 -->
<el-form-item label="返佣总金额" prop="Commission" v-if="FxState==1"> <el-form-item label="返佣总金额" prop="Commission" v-if="FxState==1">
<el-input v-model="addMsg.Commission" @keyup.native="checkPrice(addMsg,'Commission')" size="small" placeholder="请输入内容" class="input-with-select"> <el-input v-model="addMsg.Commission" @keyup.native="checkPrice(addMsg,'Commission')" size="small"
<el-button slot="append">元</el-button> placeholder="请输入内容" class="input-with-select">
<el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品面议"> <el-form-item label="商品面议">
...@@ -335,27 +347,32 @@ ...@@ -335,27 +347,32 @@
</template> </template>
<el-table-column :render-header="renderHeader" label="价格"> <el-table-column :render-header="renderHeader" label="价格">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.SellingPrice" @keyup.native="checkPrice(scope.row,'SellingPrice')" size="small"></el-input> <el-input v-model="scope.row.SellingPrice"
@keyup.native="checkPrice(scope.row,'SellingPrice')" size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" label="库存"> <el-table-column :render-header="renderHeader" label="库存">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.InventoryNum" @keyup.native="checkPrice(scope.row,'InventoryNum')" size="small"></el-input> <el-input v-model="scope.row.InventoryNum"
@keyup.native="checkPrice(scope.row,'InventoryNum')" size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" label="成本价" width="90"> <el-table-column :render-header="renderHeader" label="成本价" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.CostMoney" @keyup.native="checkPrice(scope.row,'CostMoney')" size="small"></el-input> <el-input v-model="scope.row.CostMoney" @keyup.native="checkPrice(scope.row,'CostMoney')"
size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" v-if="FxState==1" width="120" label="返佣总金额"> <el-table-column :render-header="renderHeader" v-if="FxState==1" width="120" label="返佣总金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.Commission" @keyup.native="checkPrice(scope.row,'Commission')" size="small"></el-input> <el-input v-model="scope.row.Commission"
@keyup.native="checkPrice(scope.row,'Commission')" size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量(克)" width="90"> <el-table-column label="重量(克)" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.GoodsWeight" @keyup.native="checkPrice(scope.row,'GoodsWeight')" size="small"></el-input> <el-input v-model="scope.row.GoodsWeight"
@keyup.native="checkPrice(scope.row,'GoodsWeight')" size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="货号"> <el-table-column prop="address" label="货号">
...@@ -514,8 +531,8 @@ ...@@ -514,8 +531,8 @@
</div> </div>
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.IntegralPresent" style="width:100%;margin-left:15px" type="number" <el-input v-model="addMsg.IntegralPresent" style="width:100%;margin-left:15px" type="number" min="1"
min="1" size="small" placeholder="请输入内容" class="input-with-select"> size="small" placeholder="请输入内容" class="input-with-select">
<el-button slot="append"> <el-button slot="append">
分 分
<el-radio v-model="addMsg.IntegralPresentType" :label="2">固定值</el-radio> <el-radio v-model="addMsg.IntegralPresentType" :label="2">固定值</el-radio>
...@@ -528,8 +545,8 @@ ...@@ -528,8 +545,8 @@
placement="top" style="position: absolute;left: -10px;top:12px"> placement="top" style="position: absolute;left: -10px;top:12px">
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.PointsDeduction" style="width:100%;margin-left:15px" type="number" <el-input v-model="addMsg.PointsDeduction" style="width:100%;margin-left:15px" type="number" min="1"
min="1" size="small" placeholder="请输入内容" class="input-with-select"> size="small" placeholder="请输入内容" class="input-with-select">
<template slot="prepend">最多抵扣</template> <template slot="prepend">最多抵扣</template>
<el-button slot="append"> <el-button slot="append">
元 元
...@@ -542,53 +559,47 @@ ...@@ -542,53 +559,47 @@
<el-checkbox v-model="addMsg.IsMultipleDeduction" :true-label="1" :false-label="2">允许多件抵扣 <el-checkbox v-model="addMsg.IsMultipleDeduction" :true-label="1" :false-label="2">允许多件抵扣
</el-checkbox> </el-checkbox>
</el-form-item> </el-form-item>
<el-form-item label="商品赠送VIP" v-if="FxState==1"> <el-form-item label="商品赠送VIP" v-if="FxState==1">
<el-select class="w150" style="margin-left:15px" v-model="addMsg.PresentFXGrade" size="small" clearable <el-select class="w150" style="margin-left:15px" v-model="addMsg.PresentFXGrade" size="small"
placeholder="请选择" @change='changeVIP'> clearable placeholder="请选择" @change='changeVIP'>
<el-option v-for="item in FXlevelList" :key="item.Id" :label="item.GradeName" :value="item.Id"> <el-option v-for="item in FXlevelList" :key="item.Id" :label="item.GradeName" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="赠送日期" v-if="FxState==1 && giveDate==true"> <el-form-item label="赠送日期" v-if="FxState==1 && giveDate==true">
<el-input v-model="addMsg.PresentFXMonth" style="width:100%;margin-left:15px" type="number" <el-input v-model="addMsg.PresentFXMonth" style="width:100%;margin-left:15px" type="number" min="1"
min="1" size="small" placeholder="请输入内容" class="input-with-select"> size="small" placeholder="请输入内容" class="input-with-select">
<el-button slot="append"> <el-button slot="append">
月 月
</el-button> </el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="广告词"> <el-form-item label="广告词">
<el-input v-model="addMsg.Advertising" style="width:100%;margin-left:15px" type="textarea" :rows="3" <el-input v-model="addMsg.Advertising" style="width:100%;margin-left:15px" type="textarea" :rows="3"
size="small" placeholder="请输入内容" class="input-with-select"></el-input> size="small" placeholder="请输入内容" class="input-with-select"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标签类型"> <el-form-item label="标签类型">
<el-radio v-model="addMsg.MarketingLogo.iswords" :label="1">文字模式</el-radio> <el-radio v-model="addMsg.MarketingLogo.iswords" :label="1">文字模式</el-radio>
<el-radio v-model="addMsg.MarketingLogo.iswords" :label="2">图片模式</el-radio> <el-radio v-model="addMsg.MarketingLogo.iswords" :label="2">图片模式</el-radio>
<el-radio v-model="addMsg.MarketingLogo.iswords" :label="0">无模式</el-radio> <el-radio v-model="addMsg.MarketingLogo.iswords" :label="0">无模式</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="标签文字" v-if="addMsg.MarketingLogo.iswords==1" > <el-form-item label="标签文字" v-if="addMsg.MarketingLogo.iswords==1">
<el-input v-model="addMsg.MarketingLogo.words" style="width:100%;margin-left:15px" <el-input v-model="addMsg.MarketingLogo.words" style="width:100%;margin-left:15px" size="small"
size="small" placeholder="请输入内容" class="input-with-select" maxlength='10' show-word-limit></el-input> placeholder="请输入内容" class="input-with-select" maxlength='10' show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标签字体颜色" v-if="addMsg.MarketingLogo.iswords==1"> <el-form-item label="标签字体颜色" v-if="addMsg.MarketingLogo.iswords==1">
<el-color-picker <el-color-picker style="width:100%;margin-left:15px" v-model="addMsg.MarketingLogo.wordsColor"
style="width:100%;margin-left:15px" show-alpha :predefine="predefineColors">
v-model="addMsg.MarketingLogo.wordsColor"
show-alpha
:predefine="predefineColors">
</el-color-picker> </el-color-picker>
</el-form-item> </el-form-item>
<el-form-item label="标签背景颜色" v-if="addMsg.MarketingLogo.iswords==1"> <el-form-item label="标签背景颜色" v-if="addMsg.MarketingLogo.iswords==1">
<el-color-picker <el-color-picker style="width:100%;margin-left:15px" v-model="addMsg.MarketingLogo.wordsBack"
style="width:100%;margin-left:15px" show-alpha :predefine="predefineColors">
v-model="addMsg.MarketingLogo.wordsBack"
show-alpha
:predefine="predefineColors">
</el-color-picker> </el-color-picker>
</el-form-item> </el-form-item>
<el-form-item class="commonLabel discount" label="标签图片" v-if="addMsg.MarketingLogo.iswords==2"> <el-form-item class="commonLabel discount" label="标签图片" v-if="addMsg.MarketingLogo.iswords==2">
<el-tooltip class="item" effect="dark" content="建议尺寸" placement="top"> <el-tooltip class="item" effect="dark" content="建议尺寸" placement="top">
<el-button @click="openChangeDig(4)" size="small">选择图片</el-button> <el-button @click="openChangeDig(4)" size="small">选择图片</el-button>
</el-tooltip> </el-tooltip>
...@@ -597,7 +608,8 @@ ...@@ -597,7 +608,8 @@
!addMsg.MarketingLogo.ico || !addMsg.MarketingLogo.ico ||
addMsg.MarketingLogo.ico == '' addMsg.MarketingLogo.ico == ''
" src="../../assets/img/default.png" style="width:80px;height:80px" alt="" /> " src="../../assets/img/default.png" style="width:80px;height:80px" alt="" />
<el-button @click="addMsg.MarketingLogo.ico = ''" style="position: absolute;right: 6px;top: -10px;" v-if=" <el-button @click="addMsg.MarketingLogo.ico = ''"
style="position: absolute;right: 6px;top: -10px;" v-if="
addMsg.MarketingLogo.ico && addMsg.MarketingLogo.ico &&
addMsg.MarketingLogo.ico != '' addMsg.MarketingLogo.ico != ''
" size="mini" type="danger" icon="el-icon-close" circle></el-button> " size="mini" type="danger" icon="el-icon-close" circle></el-button>
...@@ -1090,7 +1102,7 @@ ...@@ -1090,7 +1102,7 @@
CustomShareTitles: "", CustomShareTitles: "",
CustomShareImage: "", CustomShareImage: "",
CustomShareImagePath: "", CustomShareImagePath: "",
IsLiveGoods:2, //直播商品 IsLiveGoods: 2, //直播商品
GoodsStatus: 0, GoodsStatus: 0,
InventoryNum: 0, InventoryNum: 0,
DefaultSpecificationName: "", DefaultSpecificationName: "",
...@@ -1123,7 +1135,7 @@ ...@@ -1123,7 +1135,7 @@
GoodsDetails: "", GoodsDetails: "",
SeparateDistribution: 2, SeparateDistribution: 2,
SeparateDistributionType: 1, SeparateDistributionType: 1,
SeparateDistributionMoneyType: 2, //默认显示固定金额 SeparateDistributionMoneyType: 2, //默认显示固定金额
EnjoyMember: 1, EnjoyMember: 1,
SeparateSetMember: 2, SeparateSetMember: 2,
IsQuickBuy: 1, IsQuickBuy: 1,
...@@ -1131,12 +1143,20 @@ ...@@ -1131,12 +1143,20 @@
FullMoneyPinkage: 0, FullMoneyPinkage: 0,
SupplierId: '', SupplierId: '',
Sort: 0, Sort: 0,
Commission:0, Commission: 0,
PresentFXGrade:'', PresentFXGrade: '',
PresentFXMonth:0, PresentFXMonth: 0,
Advertising:'', Advertising: '',
SubName:'', SubName: '',
MarketingLogo:{iswords:0,words:"",wordsColor:"",wordsBack:"",ico:""} MarketingLogo: {
iswords: 0,
words: "",
wordsColor: "",
wordsBack: "",
ico: ""
},
ShelvesDate: '', //自动上架时间
DownDate: '', //自动下架时间
}, },
predefineColors: [ predefineColors: [
'#000000', '#000000',
...@@ -1234,13 +1254,13 @@ ...@@ -1234,13 +1254,13 @@
imgListIndex2: 0, imgListIndex2: 0,
NewCategoryList: [], NewCategoryList: [],
hpState: 0, hpState: 0,
FxState:0, FxState: 0,
SuggestPriceInfo: {}, SuggestPriceInfo: {},
shareSettings: [], shareSettings: [],
companyCommission: 0, companyCommission: 0,
options: [], options: [],
FXlevelList:[], FXlevelList: [],
giveDate:false, giveDate: false,
}; };
}, },
created() { created() {
...@@ -1314,10 +1334,10 @@ ...@@ -1314,10 +1334,10 @@
} }
}, },
HpChange() { HpChange() {
if(this.FxState==1){ if (this.FxState == 1) {
this.Error("已开启粉象分销，请在粉象分销里面配置！"); this.Error("已开启粉象分销，请在粉象分销里面配置！");
this.addMsg.SeparateDistribution = 0; this.addMsg.SeparateDistribution = 0;
} else if(this.hpState == 1){ } else if (this.hpState == 1) {
this.Error("已开启和平分销，请在和平分销里面配置！"); this.Error("已开启和平分销，请在和平分销里面配置！");
this.addMsg.SeparateDistribution = 0; this.addMsg.SeparateDistribution = 0;
} }
...@@ -1433,10 +1453,10 @@ ...@@ -1433,10 +1453,10 @@
if (this.ggpl == 4) { if (this.ggpl == 4) {
item.GoodsNumbers = this.valpl; item.GoodsNumbers = this.valpl;
} }
if(this.ggpl == 5){ if (this.ggpl == 5) {
item.CostMoney = this.valpl; item.CostMoney = this.valpl;
} }
if(this.ggpl == 6){ if (this.ggpl == 6) {
item.Commission = this.valpl; item.Commission = this.valpl;
} }
} }
...@@ -1762,7 +1782,7 @@ ...@@ -1762,7 +1782,7 @@
if (valid) { if (valid) {
let content = this.$refs.ue.getUEContent(); let content = this.$refs.ue.getUEContent();
this.addMsg.GoodsDetails = content; this.addMsg.GoodsDetails = content;
if(this.addMsg.CategoryList.length==0){ if (this.addMsg.CategoryList.length == 0) {
this.Error('请选择商品分类'); this.Error('请选择商品分类');
return false return false
} }
...@@ -1772,7 +1792,7 @@ ...@@ -1772,7 +1792,7 @@
if (this.SpecificationList.length == 0) { if (this.SpecificationList.length == 0) {
this.addMsg.IsCustomSpecification = 2; this.addMsg.IsCustomSpecification = 2;
} }
if(this.addMsg.IsCustomSpecification != 1 && this.SpecificationList.length==0){ if (this.addMsg.IsCustomSpecification != 1 && this.SpecificationList.length == 0) {
this.Error("请选择规格项目!"); this.Error("请选择规格项目!");
return return
} }
...@@ -1794,48 +1814,54 @@ ...@@ -1794,48 +1814,54 @@
this.addMsg.MemberPriceTreeList = this.memberList2; this.addMsg.MemberPriceTreeList = this.memberList2;
} }
let mall_userInfo = JSON.parse(localStorage.mall_userInfo) let mall_userInfo = JSON.parse(localStorage.mall_userInfo)
if(mall_userInfo.TenantId==1 && mall_userInfo.MallBaseId==1 && this.SupplierId ==''){ if (mall_userInfo.TenantId == 1 && mall_userInfo.MallBaseId == 1 && this.SupplierId == '') {
this.Error("请选择供应商!"); this.Error("请选择供应商!");
return return
}else{ } else {
this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0; this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0;
} }
this.addMsg.SpecificationPriceList = this.SpecificationPriceList; this.addMsg.SpecificationPriceList = this.SpecificationPriceList;
this.addMsg.SpecificationList = this.SpecificationList; this.addMsg.SpecificationList = this.SpecificationList;
for(var i=0;i<this.addMsg.SpecificationPriceList.length;i++){ for (var i = 0; i < this.addMsg.SpecificationPriceList.length; i++) {
if(this.addMsg.SpecificationPriceList[i].SellingPrice===''){ if (this.addMsg.SpecificationPriceList[i].SellingPrice === '') {
this.Error('请输入商品规格第'+(i+1)+'行价格'); this.Error('请输入商品规格第' + (i + 1) + '行价格');
return return
} }
if(this.addMsg.SpecificationPriceList[i].InventoryNum===''){ if (this.addMsg.SpecificationPriceList[i].InventoryNum === '') {
this.Error('请输入商品规格第'+(i+1)+'行库存'); this.Error('请输入商品规格第' + (i + 1) + '行库存');
return return
} }
if(this.addMsg.SpecificationPriceList[i].CostMoney===''){ if (this.addMsg.SpecificationPriceList[i].CostMoney === '') {
this.Error('请输入商品规格第'+(i+1)+'行成本价'); this.Error('请输入商品规格第' + (i + 1) + '行成本价');
return return
} }
if(this.FxState==1){ if (this.FxState == 1) {
if(this.addMsg.SpecificationPriceList[i].Commission===''){ if (this.addMsg.SpecificationPriceList[i].Commission === '') {
this.Error('请输入商品规格第'+(i+1)+'行返佣总金额'); this.Error('请输入商品规格第' + (i + 1) + '行返佣总金额');
return return
} }
} }
} }
if(this.addMsg.PresentFXGrade==''){//没选择的时候默认为0 if (this.addMsg.PresentFXGrade == '') { //没选择的时候默认为0
this.addMsg.PresentFXGrade=0 this.addMsg.PresentFXGrade = 0
} }
//标签的判断和处理 //标签的判断和处理
if(this.addMsg.MarketingLogo.iswords==0){ if (this.addMsg.MarketingLogo.iswords == 0) {
this.addMsg.MarketingLogo = {iswords:0,words:"",wordsColor:"",wordsBack:"",ico:""} this.addMsg.MarketingLogo = {
}else if(this.addMsg.MarketingLogo.iswords==1){ iswords: 0,
this.addMsg.MarketingLogo.ico= '' words: "",
}else if(this.addMsg.MarketingLogo.iswords==2){ wordsColor: "",
this.addMsg.MarketingLogo.words= ''; wordsBack: "",
this.addMsg.MarketingLogo.wordsColor= ''; ico: ""
this.addMsg.MarketingLogo.wordsBack= '';
} }
this.addMsg.MarketingLogo = JSON.stringify( this.addMsg.MarketingLogo) } else if (this.addMsg.MarketingLogo.iswords == 1) {
this.addMsg.MarketingLogo.ico = ''
} else if (this.addMsg.MarketingLogo.iswords == 2) {
this.addMsg.MarketingLogo.words = '';
this.addMsg.MarketingLogo.wordsColor = '';
this.addMsg.MarketingLogo.wordsBack = '';
}
this.addMsg.MarketingLogo = JSON.stringify(this.addMsg.MarketingLogo)
this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => { this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
...@@ -1966,8 +1992,8 @@ ...@@ -1966,8 +1992,8 @@
imgListIndex2 imgListIndex2
].Image = that.getIconLink(msg[0].url); ].Image = that.getIconLink(msg[0].url);
} }
if(this.imgType == 4){ if (this.imgType == 4) {
that.addMsg.MarketingLogo.ico = that.getIconLink(msg[0].url) that.addMsg.MarketingLogo.ico = that.getIconLink(msg[0].url)
} }
} }
this.changeState = false; this.changeState = false;
...@@ -2042,7 +2068,7 @@ ...@@ -2042,7 +2068,7 @@
} }
}); });
}, },
getcode(){//编码获取详情 getcode() { //编码获取详情
this.GoodsId = this.addMsg.Id; this.GoodsId = this.addMsg.Id;
this.getData() this.getData()
...@@ -2053,64 +2079,70 @@ ...@@ -2053,64 +2079,70 @@
GoodsId: this.GoodsId GoodsId: this.GoodsId
}, },
res => { res => {
if(res.data.resultCode == 1){ if (res.data.resultCode == 1) {
this.addMsg = res.data.data; this.addMsg = res.data.data;
if (this.addMsg.SupplierId != 0) { if (this.addMsg.SupplierId != 0) {
this.SupplierId = this.addMsg.SupplierId; this.SupplierId = this.addMsg.SupplierId;
}
if (!this.$route.query.GoodsId) {
this.addMsg.Id = 0
}
if (this.addMsg.LimitBuyGoodsNum != -1) {
this.BuyGoodsNumState = false
}
if (this.addMsg.LimitBuyOrderNum != -1) {
this.BuyOrderNumState = false
}
this.initShareSettings();
this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
this.ComTreeList = this.addMsg.DistributionCommissionTreeList;
this.SpecificationList = this.addMsg.SpecificationList;
if (this.SpecificationList.length > 0) { //根据编码来的详情 重新调用这个方法 否则分销详情设置没有数据
this.getDistributor()
}
if (this.addMsg.SeparateDistributionType == 1) {
this.disList1 = this.addMsg.DistributionCommissionTreeList;
if (this.addMsg.DistributionCommissionTreeList.length > 0) {
this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList;
} }
if (!this.$route.query.GoodsId) { }
this.addMsg.Id=0 this.memberList2 = this.addMsg.MemberPriceTreeList;
} this.thisType = 1;
if (this.addMsg.LimitBuyGoodsNum != -1) { this.disList1 = [];
this.BuyGoodsNumState = false let objNew = {
} SpecificationSort: "",
if (this.addMsg.LimitBuyOrderNum != -1) { GradeCommissionList: this.GradeCommissionList
this.BuyOrderNumState = false };
} this.disList1.push(objNew);
this.initShareSettings(); if (this.addMsg.GoodsDetails && this.addMsg.GoodsDetails != "") {
this.SpecificationPriceList = this.addMsg.SpecificationPriceList; // this.$refs.ue.SetVal(this.addMsg.GoodsDetails);
this.ComTreeList = this.addMsg.DistributionCommissionTreeList; this.defaultMsg = this.addMsg.GoodsDetails;
this.SpecificationList = this.addMsg.SpecificationList; }
if(this.SpecificationList.length>0){ //根据编码来的详情 重新调用这个方法 否则分销详情设置没有数据 this.NewCategoryList = [];
this.getDistributor() this.addMsg.CategoryList.forEach(item => {
} item.Name = item.CategoryName;
if (this.addMsg.SeparateDistributionType == 1) { this.NewCategoryList.push(item.CategoryId);
this.disList1 = this.addMsg.DistributionCommissionTreeList; });
if (this.addMsg.DistributionCommissionTreeList.length > 0) { if (this.hpState == 1) {
this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList; this.addMsg.SeparateDistribution = 0;
} }
} if (this.addMsg.PresentFXGrade == 0) {
this.memberList2 = this.addMsg.MemberPriceTreeList; this.addMsg.PresentFXGrade = ''
this.thisType = 1; }
this.disList1 = []; if (this.addMsg.MarketingLogo == null) {
let objNew = { this.addMsg.MarketingLogo = {
SpecificationSort: "", iswords: 0,
GradeCommissionList: this.GradeCommissionList words: "",
}; wordsColor: "",
this.disList1.push(objNew); wordsBack: "",
if (this.addMsg.GoodsDetails && this.addMsg.GoodsDetails != "") { ico: ""
// this.$refs.ue.SetVal(this.addMsg.GoodsDetails);
this.defaultMsg=this.addMsg.GoodsDetails;
}
this.NewCategoryList = [];
this.addMsg.CategoryList.forEach(item => {
item.Name = item.CategoryName;
this.NewCategoryList.push(item.CategoryId);
});
if (this.hpState == 1) {
this.addMsg.SeparateDistribution = 0;
}
if(this.addMsg.PresentFXGrade==0){
this.addMsg.PresentFXGrade=''
}
if( this.addMsg.MarketingLogo==null){
this.addMsg.MarketingLogo ={iswords:0,words:"",wordsColor:"",wordsBack:"",ico:""}
}else{
this.addMsg.MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
} }
this.getSuggestPrice(); } else {
this.getFXDGradeList2(); this.addMsg.MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
}
this.getSuggestPrice();
this.getFXDGradeList2();
} }
...@@ -2264,68 +2296,73 @@ ...@@ -2264,68 +2296,73 @@
} }
}); });
}, },
getFXDGradeList(){ getFXDGradeList() {
this.apipost("/api/user/GetFXDistributorGradeList", {GradeName:''}, res => { this.apipost("/api/user/GetFXDistributorGradeList", {
GradeName: ''
}, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if(res.data.data!=null){ if (res.data.data != null) {
let data = res.data.data; let data = res.data.data;
let List =[]; let List = [];
data.forEach(x=>{ data.forEach(x => {
let obj={}; let obj = {};
// if(x.IsGuest !=1){ // if(x.IsGuest !=1){
if(x.IsGuest ==3){//只显示vip if (x.IsGuest == 3) { //只显示vip
let obj = x let obj = x
List.push(obj) List.push(obj)
} }
}) })
this.FXlevelList = List; this.FXlevelList = List;
} }
} }
}); });
}, },
getFXDGradeList2(){ getFXDGradeList2() {
this.apipost("/api/user/GetFXDistributorGradeList", {GradeName:''}, res => { this.apipost("/api/user/GetFXDistributorGradeList", {
GradeName: ''
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if(res.data.data!=null){ if (res.data.data != null) {
res.data.data.forEach(x=>{ res.data.data.forEach(x => {
if(x.Id== this.addMsg.PresentFXGrade){ if (x.Id == this.addMsg.PresentFXGrade) {
if(x.IsGuest==3){ if (x.IsGuest == 3) {
this.giveDate=true; this.giveDate = true;
}else{ } else {
this.giveDate=false; this.giveDate = false;
this.addMsg.PresentFXMonth=0; this.addMsg.PresentFXMonth = 0;
}
} }
}) }
})
} }
} }
}); });
}, },
changeVIP(){ changeVIP() {
if(this.addMsg.PresentFXGrade=='' || this.addMsg.PresentFXGrade==0){ if (this.addMsg.PresentFXGrade == '' || this.addMsg.PresentFXGrade == 0) {
this.giveDate=false; this.giveDate = false;
this.addMsg.PresentFXMonth=0 this.addMsg.PresentFXMonth = 0
}else{ } else {
this.giveDate=true; this.giveDate = true;
} }
// this.FXlevelList.forEach(x=>{ // this.FXlevelList.forEach(x=>{
// if(x.Id== this.addMsg.PresentFXGrade){ // if(x.Id== this.addMsg.PresentFXGrade){
// if(x.IsGuest==3){ // if(x.IsGuest==3){
// this.giveDate=true; // this.giveDate=true;
// this.addMsg.PresentFXMonth=1; // this.addMsg.PresentFXMonth=1;
// }else{ // }else{
// this.giveDate=false; // this.giveDate=false;
// this.addMsg.PresentFXMonth=0; // this.addMsg.PresentFXMonth=0;
// } // }
// } // }
// }) // })
} }
} }
}; };
</script> </script>
<style> <style>
.app-attr-group .close { .app-attr-group .close {
...@@ -2564,24 +2601,29 @@ ...@@ -2564,24 +2601,29 @@
margin: 20px 0; margin: 20px 0;
font-size: 12px; font-size: 12px;
} }
@media (max-width:1920px) and (min-width:1300px) { @media (max-width:1920px) and (min-width:1300px) {
.goodsListEdit .el-col-12 { .goodsListEdit .el-col-12 {
width: 50%; width: 50%;
} }
} }
@media (max-width:1910px) and (min-width:1200px) { @media (max-width:1910px) and (min-width:1200px) {
.goodsListEdit .el-col-12 { .goodsListEdit .el-col-12 {
width: 66.66667%; width: 66.66667%;
} }
} }
@media (max-width:1199px) and (min-width:200px) { @media (max-width:1199px) and (min-width:200px) {
.goodsListEdit .el-col-12 { .goodsListEdit .el-col-12 {
width: 80%; width: 80%;
} }
} }
.edui1_imagescale img{
.edui1_imagescale img {
max-width: 100%; max-width: 100%;
} }
.goodsListEdit .nav_Main { .goodsListEdit .nav_Main {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
...@@ -2593,7 +2635,9 @@ ...@@ -2593,7 +2635,9 @@
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;
} }
.goodsListEdit .nav_IconContent div>div{
.goodsListEdit .nav_IconContent div>div {
display: inline-block; display: inline-block;
} }
</style> </style>
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