Skip to content

E
ElectricitySheep
Commit b268ad40 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 2c49ecc4
Show whitespace changes
Inline Side-by-side
Showing with 168 additions and 90 deletions
src/components/common/choiceGood.vue
View file @ b268ad40
......@@ -6,8 +6,18 @@
</el-input>
<el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" height="450" style="width: 100%"
@selection-change="handleSelectionChange">
<template v-if="isSingle">
<el-table-column width="50px" label="">
<template slot-scope="scope">
<el-radio v-model="scope.row.IsChecked" @change.native="getTemplateRow(scope.$index,scope.row)">&nbsp;
</el-radio>
</template>
</el-table-column>
</template>
<template v-else>
<el-table-column type="selection" width="50px">
</el-table-column>
</template>
<el-table-column label="ID" width="80px">
<template slot-scope="scope">{{ scope.row.Id }}</template>
</el-table-column>
......@@ -34,7 +44,7 @@
</template>
<script>
export default {
props:['ckGoods'],
props: ['ckGoods', "isSingle", "IsGetSpec"],
data() {
return {
dataList: [],
......@@ -42,32 +52,52 @@
pageIndex: 1,
pageSize: 15,
Name: '',
GoodsStatus:1 //上架中
GoodsStatus: 1, //上架中
IsGetSpec: 0
},
total: 0,
selectRow: [],
};
},
created() {},
created() {
console.log("this.IsGetSpec", this.IsGetSpec)
if (this.IsGetSpec) {
this.msg.IsGetSpec = this.IsGetSpec;
}
},
methods: {
//获取所有菜单
getList() {
this.apipost("/api/product/GetProductGoodsDialogList", this.msg, res => {
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
var tempArray = res.data.data.pageData;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
item.IsChecked = false;
});
}
this.dataList = JSON.parse(JSON.stringify(tempArray));
} else {
this.Info(res.data.message);
}
})
},
handleSelectionChange(val) {
// if(val.length>this.ckGoods){
// this.Info('超过了');
// val=val.slice(0,this.ckGoods);
// }
this.selectRow = JSON.parse(JSON.stringify(val));
},
getTemplateRow(index, row) {
this.selectRow = [];
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => {
if (item.Id != row.Id) {
item.IsChecked = false;
}
})
}
this.selectRow.push(JSON.parse(JSON.stringify(row)));
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......
src/components/pintuan/pintuanActive.vue
View file @ b268ad40
......@@ -39,13 +39,13 @@
<el-row>
<el-col :span="24">
<el-form-item label="开始时间">
<el-date-picker v-model="addMsg.start_time" size="small" type="datetime" placeholder="选择日期时间">
<el-date-picker v-model="addMsg.StartTime" size="small" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="结束时间">
<el-date-picker v-model="addMsg.end_time" size="small" type="datetime" placeholder="选择日期时间">
<el-date-picker v-model="addMsg.EndTime" size="small" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -64,14 +64,15 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-button type="text">文字按钮</el-button>
<el-button type="text" @click="isShowGoods=true">选择商品</el-button>
</el-form-item>
<el-form-item label="商品名称" prop="Name">
<el-input size="small" v-model="addMsg.name" placeholder="请输入内容" maxlength="100">
</el-input>
</el-form-item>
<el-form-item label="上架状态">
<el-switch active-color="#409EFF" v-model="addMsg.status" :active-value="1" :inactive-value="2">
<el-switch active-color="#409EFF" v-model="addMsg.GoodsStatus" :active-value="1"
:inactive-value="2">
</el-switch>
</el-form-item>
<el-form-item>
......@@ -93,8 +94,8 @@
</div>
<el-row>
<el-col :span="12">
<el-form-item label="售价" prop="price">
<el-input v-model="addMsg.price" type="number" min="1" size="small" placeholder="请输入内容"
<el-form-item label="售价" prop="SellingPrice">
<el-input v-model="addMsg.SellingPrice" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select">
<el-button slot="append">元</el-button>
</el-input>
......@@ -130,12 +131,11 @@
<goodsSpe></goodsSpe>
</el-form-item>
<el-form-item label="商品货号">
<el-input v-model="addMsg.goods_no" size="small" placeholder="请输入内容"
class="input-with-select">
<el-input v-model="addMsg.Goods_no" size="small" placeholder="请输入内容" class="input-with-select">
</el-input>
</el-form-item>
<el-form-item label="商品重量">
<el-input v-model="addMsg.goods_weight" type="number" min="1" size="small" placeholder="请输入内容"
<el-input v-model="addMsg.Goods_weight" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select">
<el-button slot="append">克</el-button>
</el-input>
......@@ -150,7 +150,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="是否开启虚拟成团">
<el-switch active-color="#409EFF" v-model="addMsg.is_auto_add_robot" :active-value="1" :inactive-value="2">
<el-switch active-color="#409EFF" v-model="addMsg.Is_Auto_Add_Robot" :active-value="1"
:inactive-value="2">
</el-switch>
<div style="color:#c6c6c6">开启虚拟成团后，系统将模拟“匿名买家”凑满人数促成成团，商家仅需对真实拼团买家发货</div>
</el-form-item>
......@@ -161,13 +162,14 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" :disabled="true" v-model="addMsg.virtual_sales" min="0" size="small" placeholder="请输入内容"
class="input-with-select">
<el-input type="number" :disabled="true" v-model="addMsg.Virtual_Sales" min="0" size="small"
placeholder="请输入内容" class="input-with-select">
<el-button slot="append">件</el-button>
</el-input>
</el-form-item>
<el-form-item label="是否允许单独购买">
<el-switch active-color="#409EFF" v-model="addMsg.is_alone_buy" :active-value="1" :inactive-value="2">
<el-switch active-color="#409EFF" v-model="addMsg.Is_Alone_Buy" :active-value="1"
:inactive-value="2">
</el-switch>
</el-form-item>
<el-form-item label="商品服务">
......@@ -198,21 +200,23 @@
<div flex="dir:left">
<span class="box-grow-0" style="color:#606266">商品</span>
<div style="width: 100%;margin:0 10px">
<el-input placeholder="请输入限购数量" v-model="addMsg.confine_count" size="small">
<el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Count" size="small">
<template slot="append">件</template>
</el-input>
</div>
<el-checkbox v-model="addMsg.confine_count <= -1" @change="itemChecked" style="margin-left:5px;line-height:32px;">无限制
<el-checkbox v-model="addMsg.Confine_Count <= -1" @change="itemChecked"
style="margin-left:5px;line-height:32px;">无限制
</el-checkbox>
</div>
<div flex="dir:left" style="margin-top: 10px;">
<span class="box-grow-0" style="color:#606266">订单</span>
<div style="width: 100%;margin:0 10px">
<el-input placeholder="请输入限购数量" v-model="addMsg.confine_order_count" size="small">
<el-input placeholder="请输入限购数量" v-model="addMsg.Confine_Order_Count" size="small">
<template slot="append">单</template>
</el-input>
</div>
<el-checkbox v-model="addMsg.confine_order_count<=-1" @change="itemOrderChecked" style="margin-left:5px;line-height:32px;">无限制
<el-checkbox v-model="addMsg.Confine_Order_Count<=-1" @change="itemOrderChecked"
style="margin-left:5px;line-height:32px;">无限制
</el-checkbox>
</div>
</el-form-item>
......@@ -223,8 +227,8 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" :disabled="true" v-model="addMsg.pieces" min="0" size="small" placeholder="请输入数量"
class="input-with-select">
<el-input type="number" :disabled="true" v-model="addMsg.Pieces" min="0" size="small"
placeholder="请输入数量" class="input-with-select">
<el-button slot="append">件</el-button>
</el-input>
</el-form-item>
......@@ -235,13 +239,14 @@
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" :disabled="true" v-model="addMsg.forehead" min="0" size="small" placeholder="请输入金额"
class="input-with-select">
<el-input type="number" :disabled="true" v-model="addMsg.Forehead" min="0" size="small"
placeholder="请输入金额" class="input-with-select">
<el-button slot="append">元</el-button>
</el-input>
</el-form-item>
<el-form-item label="区域购买">
<el-switch active-color="#409EFF" v-model="addMsg.is_area_limit" :active-value="1" :inactive-value="2">
<el-switch active-color="#409EFF" v-model="addMsg.Is_Area_Limit" :active-value="1"
:inactive-value="2">
</el-switch>
</el-form-item>
</el-col>
......@@ -265,12 +270,13 @@
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" min="0" v-model="addMsg.give_integral" size="small" placeholder="请输入赠送积分数量">
<el-input type="number" min="0" v-model="addMsg.Give_integral" size="small"
placeholder="请输入赠送积分数量">
<template slot="append">
分
<el-radio :label="1" v-model="addMsg.give_integral_type">固定值
<el-radio :label="1" v-model="addMsg.Give_integral_type">固定值
</el-radio>
<el-radio :label="2" v-model="addMsg.give_integral_type">百分比
<el-radio :label="2" v-model="addMsg.Give_integral_type">百分比
</el-radio>
</template>
</el-input>
......@@ -282,17 +288,18 @@
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="number" min="0" size="small" v-model="addMsg.forehead_integral" placeholder="请输最高抵扣金额">
<el-input type="number" min="0" size="small" v-model="addMsg.Is_forehead_integral"
placeholder="请输最高抵扣金额">
<template slot="prepend">最多抵扣</template>
<template slot="append">
元
<el-radio :label="1" v-model="addMsg.forehead_integral_type">固定值
<el-radio :label="1" v-model="addMsg.Forehead_integral_type">固定值
</el-radio>
<el-radio :label="2" v-model="addMsg.forehead_integral_type">百分比
<el-radio :label="2" v-model="addMsg.Forehead_integral_type">百分比
</el-radio>
</template>
</el-input>
<el-checkbox :true-label="1" v-model="addMsg.accumulative" :false-label="0">
<el-checkbox :true-label="1" v-model="addMsg.Accumulative" :false-label="0">
允许多件累计抵扣
</el-checkbox>
</el-form-item>
......@@ -315,7 +322,8 @@
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<el-input type="text" size="small" v-model="addMsg.app_share_title" placeholder="请输入分享标题"></el-input>
<el-input type="text" size="small" v-model="addMsg.App_share_title" placeholder="请输入分享标题">
</el-input>
<el-button type="text">查看图例</el-button>
</el-form-item>
<el-form-item>
......@@ -329,7 +337,7 @@
<el-button size="mini">选择图片</el-button>
</el-tooltip>
<div class="zk_pic_box" flex="main:center cross:center" style="width:80px;height:80px;">
<!-- app_share_pic -->
<!-- App_share_pic -->
<i class="el-icon-picture-outline"></i>
</div>
<el-button type="text">查看图例</el-button>
......@@ -352,10 +360,18 @@
</el-row>
</el-form>
<div class="bottom-div" flex="cross:center" style="margin-top:20px">
<el-button size="small" class="button-item" type="primary" @click="Save('addMsg')">保存</el-button>
<el-button size="small" class="button-item" type="primary" @click="SaveActivity()">保存</el-button>
<el-button size="small" class="button-item">预览</el-button>
</div>
</div>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood" :ckGoods="ckGoods" :isSingle="true" :IsGetSpec="1"></choiceGood>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="isShowGoods=false">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
</span>
</el-dialog>
<!-- 选择图片 -->
<!-- <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg>
......@@ -365,75 +381,108 @@
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import goodsSpe from "@/components/pintuan/pintuanPlugin/goodsSpecifica.vue"
import choiceGood from "@/components/common/choiceGood.vue";
export default {
components: {
ChooseImg,
goodsSpe
goodsSpe,
choiceGood
},
data() {
return {
ckGoods: 0,
isShowGoods: false, //是否显示商品
activeName: "first",
addMsg: {
start_time: '', //开始时间
end_time: '', //结束时间
ActivityId: 0, //活动Id
StartTime: '', //开始时间
EndTime: '', //结束时间
GoodId: 0, //商品编号
name: '', //商品名称
status:0, //上架状态
GoodsStatus: 0, //上架状态(0-未开始，1-上架,2-下架中,3-删除)
Sort: 100, //排序
price: 0, //售价
original_price: 0, //原价
goods_num:0, //库存
goods_stock: 0, //商品总库存
attr_default_name: '', //默认规格名
// 商品规格字段
goods_no:'', //商品货号
goods_weight:'', //商品重量
is_auto_add_robot:0, //是否开启虚拟团
virtual_sales:0, //已团商品数
is_alone_buy:0, //是否允许单独购买
Service:[], //商品服务字段
freight:'', //运费设置
form:'', //自定义表单
confine_count:-1, //限购数量
confine_order_count:-1, //限购订单
pieces:0, //单品满件包邮
forehead:0, //单品满额包邮
is_area_limit:0, //区域购买
give_integral:0, //积分赠送
give_integral_type:1, //积分赠送=>1固定值 2百分比
forehead_integral:0, //积分抵扣
forehead_integral_type:1, //积分抵扣=>1固定值 2百分比
accumulative:0, //允许多件累计抵扣
cards:[], //卡券发放
app_share_title:'', //自定义分享标题、
app_share_pic:'', //自定义分享图片
SellingPrice: 0, //售价
Original_Price: 0, //原价
Goods_Stock: 0, //商品总库存
Goods_unit: "", // 商品规格字段
Goods_no: '', //商品货号
Goods_weight: '', //商品重量
Is_Auto_Add_Robot: 0, //是否开启虚拟团
Virtual_Sales: 0, //已团商品数
Is_Alone_Buy: 0, //是否允许单独购买
IsDefaultService: 1, //是否默认商品服务(1是,2否)
GoodsService: [], //商品服务字段
FreightId: 0, //运费设置
FormsId: 0, //自定义表单
Confine_Count: -1, //限购数量
Confine_Order_Count: -1, //限购订单
Pieces: 0, //单品满件包邮
Forehead: 0, //单品满额包邮
Is_Area_Limit: 0, //区域购买
Area_limit: "", //购买区域
Give_integral: 0, //积分赠送
Give_integral_type: 1, //积分赠送=>1固定值 2百分比
Is_forehead_integral: 0, //积分抵扣
Forehead_integral_type: 1, //积分抵扣=>1固定值 2百分比
Accumulative: 0, //允许多件累计抵扣
CardIds: [], //卡券发放
App_share_title: '', //自定义分享标题、
App_share_pic: '', //自定义分享图片
},
rules: {
// Name: [{
// required: true,
// message: "请输入商品名称",
// trigger: "blur"
// }]
},
};
},
created() {},
mounted() {
// if (this.$route.query.GoodsId) {
// this.GoodsId = this.$route.query.GoodsId;
// this.getData();
// }
if (this.$route.query.Id) {
this.addMsg.ActivityId = this.$route.query.Id;
this.getData();
}
},
methods: {
//点击checkbox是否限购商品
itemChecked(type) {
this.addMsg.confine_count = type ? -1 : 0;
this.addMsg.Confine_Count = type ? -1 : 0;
},
//点击checkbox是否限购订单
itemOrderChecked(type) {
this.addMsg.confine_order_count = type ? -1 : 0;
this.addMsg.Confine_Order_Count = type ? -1 : 0;
},
//保存拼团活动
SaveActivity() {
this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
console.log("res", res);
if (res.data.resultCode == 1) {
}
})
},
//选择商品
getGoodsChoice() {
this.isShowGoods = false;
var ckedArr = this.$refs.choiceGood.getChoicedGoods();
console.log("ckedArr", ckedArr);
// var myArray = [];
// if (ckedArr && ckedArr.length > 0) {
// ckedArr.forEach(element => {
// myArray.push({
// id: element.Id,
// name: element.Name,
// picUrl: element.CoverImage,
// price: element.SellingPrice
// });
// });
// }
// if (this.comIndex !== null) {
// this.data.catList[this.comIndex].goodsList = this.data.catList[this.comIndex].goodsList.concat(myArray);
// } else {
// this.data.list = this.data.list.concat(myArray);
// }
//
// this.$refs.choiceGood.toggleSelection();
}
}
};
......
src/components/pintuan/pintuanList.vue
View file @ b268ad40
......@@ -56,7 +56,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="Goods_stock" label="库存">
<el-table-column prop="Goods_Stock" label="库存">
</el-table-column>
<el-table-column label="活动时间">
<template slot-scope="scope">
......@@ -136,7 +136,6 @@
this.loading = true;
this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => {
this.loading = false;
console.log("res", res);
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
......
src/components/sallCenter/plugin/goods.vue
View file @ b268ad40
......@@ -542,9 +542,9 @@
</el-dialog>
<!-- 选择商品 -->
<el-dialog title="选择商品" :visible.sync="isShowGoods" custom-class="goodsDialog">
<choiceGood ref="choiceGood" :ckGoods="ckGoods"></choiceGood>
<choiceGood ref="choiceGood" ></choiceGood>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="quxiaoGoods()">取 消</el-button>
<el-button size="small" @click="isShowGoods=false">取 消</el-button>
<el-button size="small" type="danger" @click="getGoodsChoice()">确 定</el-button>
</span>
</el-dialog>
......
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