Commit 21fe5904 authored by zhengke's avatar zhengke

修改

parent ed2b1176
<style> <style>
.box-grow-0 { .pintuanActive .box-grow-0 {
flex-grow: 0; flex-grow: 0;
width: 35px; min-width: 0;
flex-shrink:0;
display:inline-block;
} }
.bottom-div { .pintuanActive .bottom-div {
border-top: 1px solid #E3E3E3; border-top: 1px solid #E3E3E3;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
...@@ -15,10 +17,25 @@ ...@@ -15,10 +17,25 @@
left: 230px; left: 230px;
} }
.button-item { .pintuanActive .button-item {
padding: 9px 25px; padding: 9px 25px;
margin: 5px 0; margin: 5px 0;
} }
@media (max-width:1920px) and (min-width:1300px) {
.pintuanActive .el-col-12 {
width: 50%;
}
}
@media (max-width:1910px) and (min-width:1200px) {
.pintuanActive .el-col-12 {
width: 66.66667%;
}
}
@media (max-width:1199px) and (min-width:200px) {
.pintuanActive .el-col-12 {
width: 80%;
}
}
</style> </style>
<template> <template>
...@@ -113,12 +130,13 @@ ...@@ -113,12 +130,13 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品总库存"> <el-form-item label="商品总库存">
<el-input v-model="addMsg.Goods_Stock" size="small" :disabled="true" placeholder="请输入商品总库存" class="input-with-select"> <el-input v-model="addMsg.Goods_Stock" size="small" :disabled="true" placeholder="请输入商品总库存"
class="input-with-select">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="默认规格名"> <el-form-item label="默认规格名">
<el-input v-model="addMsg.Goods_unit" type="text" :disabled="true" size="small" placeholder="请输入默认规格名" <el-input v-model="addMsg.Goods_unit" type="text" :disabled="true" size="small"
class="input-with-select"> placeholder="请输入默认规格名" class="input-with-select">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品规格"> <el-form-item label="商品规格">
...@@ -128,15 +146,17 @@ ...@@ -128,15 +146,17 @@
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<goodsSpe v-show="IsShowSpec" :SpecList="SpecificationList" :SpecPriceList="SpecificationPriceList"></goodsSpe> <goodsSpe v-show="IsShowSpec" :SpecList="SpecificationList"
:SpecPriceList="SpecificationPriceList"></goodsSpe>
</el-form-item> </el-form-item>
<el-form-item label="商品货号"> <el-form-item label="商品货号">
<el-input v-model="addMsg.Goods_no" size="small" :disabled="true" placeholder="请输入商品货号" class="input-with-select"> <el-input v-model="addMsg.Goods_no" size="small" :disabled="true" placeholder="请输入商品货号"
class="input-with-select">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="商品重量"> <el-form-item label="商品重量">
<el-input v-model="addMsg.Goods_weight" type="number" :disabled="true" min="0" size="small" placeholder="请输入商品重量" <el-input v-model="addMsg.Goods_weight" type="number" :disabled="true" min="0" size="small"
class="input-with-select"> placeholder="请输入商品重量" class="input-with-select">
<el-button slot="append"></el-button> <el-button slot="append"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -173,8 +193,15 @@ ...@@ -173,8 +193,15 @@
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="商品服务"> <el-form-item label="商品服务">
<el-button size="small">新增服务</el-button> <template v-if="addMsg.GoodsService && addMsg.GoodsService.length > 0">
<el-checkbox>默认服务</el-checkbox> <el-tag style="margin-right:10px;" @close="ServiceCheck(item, index)"
v-for="(item, index) in addMsg.GoodsService" :key="index+'7'" closable>{{ item.Name }}
</el-tag>
</template>
<el-button @click="serviceDig = true,checkService=[]" v-if="addMsg.IsDefaultService == 2"
size="mini">新增服务</el-button>
<el-checkbox v-model="addMsg.IsDefaultService" @change="getServeChange(addMsg.IsDefaultService)"
:true-label="1" :false-label="2">默认服务</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<template slot="label"> <template slot="label">
...@@ -184,7 +211,13 @@ ...@@ -184,7 +211,13 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-button size="small">选择运费</el-button> <template v-if="AreaName && AreaName != ''">
<el-tag style="margin-right:10px;" @close="
(AreaName = ''), (addMsg.FreightId = 0)
" closable>
{{ AreaName }}</el-tag>
</template>
<el-button @click="chooseyfDig = true" size="mini">选择运费</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<template slot="label"> <template slot="label">
...@@ -194,7 +227,12 @@ ...@@ -194,7 +227,12 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
</template> </template>
<el-button size="small">选择表单</el-button> <template v-if="formName && formName != ''">
<el-tag style="margin-right:10px;" @close="(formName = ''),(checkedForm=''), (addMsg.FormsId = 0)"
closable>
{{ formName }}</el-tag>
</template>
<el-button @click="choosebdDig = true" size="mini">选择表单</el-button>
</el-form-item> </el-form-item>
<el-form-item label="限购数量" size="small"> <el-form-item label="限购数量" size="small">
<div flex="dir:left"> <div flex="dir:left">
...@@ -352,6 +390,7 @@ ...@@ -352,6 +390,7 @@
<distributePrice></distributePrice> <distributePrice></distributePrice>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="会员价设置"> <el-tab-pane label="会员价设置">
<memberPrice></memberPrice>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-row> </el-row>
...@@ -362,7 +401,7 @@ ...@@ -362,7 +401,7 @@
</div> </div>
</div> </div>
<!-- 选择商品 --> <!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog"> <el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog" width="800px">
<choiceGood ref="choiceGood" :ckGoods="ckGoods" :isSingle="true" :IsGetSpec="1"></choiceGood> <choiceGood ref="choiceGood" :ckGoods="ckGoods" :isSingle="true" :IsGetSpec="1"></choiceGood>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="isShowGoods=false">取 消</el-button> <el-button size="small" @click="isShowGoods=false">取 消</el-button>
...@@ -373,6 +412,51 @@ ...@@ -373,6 +412,51 @@
<!-- <el-dialog title="选择文件" :visible.sync="changeState" width="1240px"> <!-- <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg> <ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg>
</el-dialog> --> </el-dialog> -->
<!-- 选择商品服务 -->
<el-dialog title="选择商品服务" :visible.sync="serviceDig" width="600px">
<div style="border: 1px solid #EBEEF5;padding:20px 0">
<el-checkbox-group v-model="checkService">
<el-checkbox style="margin:5px" v-for="item in serviceList" :label="item" :key="item.Id">{{ item.Name }}
</el-checkbox>
</el-checkbox-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="serviceDig=false" size="small">取消</el-button>
<el-button @click="(addMsg.GoodsService = checkService), (serviceDig = false)" size="small" type="primary">确定
</el-button>
</span>
</el-dialog>
<!-- 选择运费 -->
<el-dialog title="选择运费" top="2%" :visible.sync="chooseyfDig" width="600px">
<div>
<el-radio-group v-model="selectYunFei">
<el-radio @change="YfSelect" style="padding-bottom:10px" class="yfradio"
:label="{ RulesName: '默认运费', ID: 0 }">默认运费
</el-radio>
<el-radio @change="YfSelect" style="padding-bottom:10px" class="yfradio" v-for="(item, index) in ruleList"
:key="index+'23'" :label="item">{{ item.RulesName }}</el-radio>
</el-radio-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="chooseyfDig = false">取 消</el-button>
<el-button size="small" @click="chooseyfDig=false" type="primary">确 定</el-button>
</span>
</el-dialog>
<!-- 选择表单 -->
<el-dialog title="选择表单" top="2%" :visible.sync="choosebdDig" width="30%">
<div>
<el-radio-group v-model="checkedForm">
<el-radio :label="0">
默认表单
</el-radio>
</el-radio-group>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="choosebdDig = false">取 消</el-button>
<el-button size="small" @click="getCkedForm" type="primary">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -381,6 +465,7 @@ ...@@ -381,6 +465,7 @@
import choiceGood from "@/components/common/choiceGood.vue"; import choiceGood from "@/components/common/choiceGood.vue";
import ladderGroup from "@/components/pintuan/pintuanPlugin/ladderGroup.vue" import ladderGroup from "@/components/pintuan/pintuanPlugin/ladderGroup.vue"
import distributePrice from "@/components/pintuan/pintuanPlugin/distributePrice.vue" import distributePrice from "@/components/pintuan/pintuanPlugin/distributePrice.vue"
import memberPrice from "@/components/pintuan/pintuanPlugin/memberPrice.vue"
export default { export default {
components: { components: {
...@@ -388,7 +473,8 @@ ...@@ -388,7 +473,8 @@
goodsSpe, goodsSpe,
choiceGood, choiceGood,
ladderGroup, ladderGroup,
distributePrice distributePrice,
memberPrice
}, },
data() { data() {
return { return {
...@@ -431,9 +517,22 @@ ...@@ -431,9 +517,22 @@
App_share_title: '', //自定义分享标题、 App_share_title: '', //自定义分享标题、
App_share_pic: '', //自定义分享图片 App_share_pic: '', //自定义分享图片
}, },
IsShowSpec:false,//是否显示规格 IsShowSpec: false, //是否显示规格
SpecificationList:[],//规格列表 SpecificationList: [], //规格列表
SpecificationPriceList:[],//规格价格列表 SpecificationPriceList: [], //规格价格列表
serviceDig: false,
serviceList: [], //新增服务弹出数据
checkService: [],
chooseyfDig: false, //运费弹窗
ruleList: [], //运费数组
selectYunFei: {}, //选中运费
AreaName: '',
choosebdDig: false, //选择表单
checkedForm:'',
formName: '',
rules: { rules: {
}, },
...@@ -445,6 +544,8 @@ ...@@ -445,6 +544,8 @@
this.addMsg.ActivityId = this.$route.query.Id; this.addMsg.ActivityId = this.$route.query.Id;
this.getData(); this.getData();
} }
this.getService();
this.getRule();
}, },
methods: { methods: {
//点击checkbox是否限购商品 //点击checkbox是否限购商品
...@@ -457,6 +558,8 @@ ...@@ -457,6 +558,8 @@
}, },
//保存拼团活动 //保存拼团活动
SaveActivity() { SaveActivity() {
console.log(this.addMsg);
return;
this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => { this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
console.log("res", res); console.log("res", res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -467,25 +570,82 @@ ...@@ -467,25 +570,82 @@
//选择商品 //选择商品
getGoodsChoice() { getGoodsChoice() {
this.isShowGoods = false; this.isShowGoods = false;
this.IsShowSpec=false; this.IsShowSpec = false;
var chooseGoods = this.$refs.choiceGood.getChoicedGoods(); var chooseGoods = this.$refs.choiceGood.getChoicedGoods();
console.log("chooseGoods",chooseGoods); console.log("chooseGoods", chooseGoods);
if(chooseGoods&&chooseGoods.length>0) if (chooseGoods && chooseGoods.length > 0) {
{ this.addMsg.GoodId = chooseGoods[0].Id;
this.addMsg.GoodId=chooseGoods[0].Id; this.addMsg.name = chooseGoods[0].Name;
this.addMsg.name=chooseGoods[0].Name; this.addMsg.Sort = chooseGoods[0].Sort;
this.addMsg.Sort=chooseGoods[0].Sort; this.addMsg.SellingPrice = chooseGoods[0].SellingPrice;
this.addMsg.SellingPrice=chooseGoods[0].SellingPrice; this.addMsg.Original_Price = chooseGoods[0].OriginalPrice;
this.addMsg.Original_Price=chooseGoods[0].OriginalPrice; this.addMsg.Goods_Stock = chooseGoods[0].InventoryNum;
this.addMsg.Goods_Stock=chooseGoods[0].InventoryNum; this.addMsg.Goods_unit = chooseGoods[0].DefaultSpecificationName;
this.addMsg.Goods_unit=chooseGoods[0].DefaultSpecificationName; this.addMsg.Goods_no = chooseGoods[0].GoodsNumbers;
this.addMsg.Goods_no=chooseGoods[0].GoodsNumbers; this.addMsg.Goods_weight = chooseGoods[0].GoodsWeight;
this.addMsg.Goods_weight=chooseGoods[0].GoodsWeight; this.SpecificationList = chooseGoods[0].SpecificationList;
this.SpecificationList=chooseGoods[0].SpecificationList; this.SpecificationPriceList = chooseGoods[0].SpecificationPriceList;
this.SpecificationPriceList=chooseGoods[0].SpecificationPriceList; this.IsShowSpec = true;
this.IsShowSpec=true; }
this.$refs.choiceGood.toggleSelection();
},
//删除商品服务
ServiceCheck(item, index) {
this.addMsg.GoodsService.forEach((list, k) => {
if (list.Id == item.Id) {
this.addMsg.GoodsService.splice(k, 1);
}
});
},
//获取服务
getService() {
let msg = {
pageIndex: 1,
pageSize: 200,
Name: "",
IsDefault: 0
};
this.apipost("/api/product/GetProductServicePageList", msg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.serviceList = pageData;
}
});
},
//服务改变
getServeChange(type) {
if (type == 1) {
this.addMsg.GoodsService = [];
}
},
//获取运费规则
getRule() {
let msg1 = {
pageIndex: 1,
pageSize: 999,
RulesName: ""
};
this.apipost("/api/MallBase/GetLogisticsRulesPage", msg1, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.ruleList = pageData;
}
});
},
//点击radio
YfSelect(val) {
this.addMsg.FreightId = val.ID;
this.AreaName = val.RulesName;
},
//选择默认表单
getCkedForm(){
if(this.checkedForm===''){
this.addMsg.FormsId=0;
}else{
this.addMsg.FormsId=this.checkedForm;
} }
this.$refs.choiceGood.toggleSelection(); this.formName='默认表单';
this.choosebdDig=false;
} }
} }
}; };
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<el-tag type="danger">3人团</el-tag> <el-tag type="danger">3人团</el-tag>
</div> </div>
<label style="margin-bottom:0;padding:18px 10px;">批量设置</label> <label style="margin-bottom:0;padding:18px 10px;">批量设置</label>
<el-select placeholder="请选择层级" style="width:130px;" size="small"> <el-select placeholder="请选择层级" v-model="fenxiao" style="width:130px;" size="small">
<el-option label="一级分销" :value="1"></el-option> <el-option label="一级分销" :value="1"></el-option>
<el-option label="二级分销" :value="2"></el-option> <el-option label="二级分销" :value="2"></el-option>
</el-select> </el-select>
...@@ -50,8 +50,26 @@ ...@@ -50,8 +50,26 @@
</el-input> </el-input>
<el-button size="small" type="primary">设置</el-button> <el-button size="small" type="primary">设置</el-button>
</div> </div>
<el-table> <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%;border:1px solid #E8EAEE"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="等级名称" prop="leval" width="100">
</el-table-column>
<el-table-column label="一级分销" width="576">
<template slot-scope="scope">
<el-input type="text" size="small" v-model="scope.row.yiji">
<el-button slot="append"></el-button>
</el-input>
</template>
</el-table-column>
<el-table-column label="二级分销" width="575">
<template slot-scope="scope">
<el-input type="text" size="small" v-model="scope.row.erji">
<el-button slot="append"></el-button>
</el-input>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</el-card> </el-card>
...@@ -67,17 +85,27 @@ ...@@ -67,17 +85,27 @@
}, },
data() { data() {
return { return {
fenxiao:0,
msg: { msg: {
individual_share: 1, individual_share: 1,
share_type: 0 share_type: 0
} },
tableData:[
{
leval:'默认等级',
yiji:0,
erji:3
}
]
}; };
}, },
created() { created() {
}, },
methods: { methods: {
handleSelectionChange(){
}
}, },
mounted() { mounted() {
......
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