Commit 44a72cd2 authored by 黄奎's avatar 黄奎

新增字段

parent ffb61fa4
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<el-button @click="tableSet(4)" style="margin-left:10px;" size="mini">上架</el-button> <el-button @click="tableSet(4)" style="margin-left:10px;" size="mini">上架</el-button>
<el-button @click="tableSet(5)" style="margin-left:10px;" size="mini">下架</el-button> <el-button @click="tableSet(5)" style="margin-left:10px;" size="mini">下架</el-button>
<el-button @click="tableSet(6)" style="margin-left:10px;" size="mini">删除</el-button> <el-button @click="tableSet(6)" style="margin-left:10px;" size="mini">删除</el-button>
<el-button @click="plsetBtn" style="margin-left:10px;" size="mini">批量设置</el-button> <el-button @click="plsetBtn" style="margin-left:10px;" size="mini" v-if="currentUserInfo.IsKorea==0">批量设置</el-button>
</div> </div>
<el-table :data="tableData" v-loading="loading" border sortable='custom' @sort-change='getSort' <el-table :data="tableData" v-loading="loading" border sortable='custom' @sort-change='getSort'
@selection-change="tableSelect" style="width: 100%;margin:20px 0"> @selection-change="tableSelect" style="width: 100%;margin:20px 0">
...@@ -112,22 +112,23 @@ ...@@ -112,22 +112,23 @@
<div flex="dir:left" style="margin-top:5px;color:#F56C6C;font-size:12px;" v-if="scope.row.Remark"> <div flex="dir:left" style="margin-top:5px;color:#F56C6C;font-size:12px;" v-if="scope.row.Remark">
<div style="width:38px;">备注:</div> <div style="width:38px;">备注:</div>
<el-tooltip class="item" effect="dark" :content="scope.row.Remark" placement="top"> <el-tooltip class="item" effect="dark" :content="scope.row.Remark" placement="top">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;width:90%;margin-left:0;"> <div class="vue-line-clamp"
style="word-break: break-all; -webkit-line-clamp: 2;width:90%;margin-left:0;">
<span>{{scope.row.Remark}}</span> <span>{{scope.row.Remark}}</span>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="SellingPrice" width="100" sortable label="售价"> <el-table-column prop="SellingPrice" width="100" sortable label="售价" v-if="currentUserInfo.IsKorea==0">
</el-table-column> </el-table-column>
<el-table-column prop="InventoryNum" width="100" sortable label="库存"> <el-table-column prop="InventoryNum" width="100" sortable label="库存" v-if="currentUserInfo.IsKorea==0">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.InventoryNum==0" style="color:red">售罄</span> <span v-if="scope.row.InventoryNum==0" style="color:red">售罄</span>
<span v-else>{{scope.row.InventoryNum}}</span> <span v-else>{{scope.row.InventoryNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120"> <el-table-column width="120" v-if="currentUserInfo.IsKorea==0">
<template slot="header"> <template slot="header">
已出售量 已出售量
<el-tooltip effect="dark" content="已出售量=实际销量+虚拟销量,按实际销量排序" placement="top"> <el-tooltip effect="dark" content="已出售量=实际销量+虚拟销量,按实际销量排序" placement="top">
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
<span>{{scope.row.GoodsBuyNum}}+{{scope.row.SalesNum}}</span> <span>{{scope.row.GoodsBuyNum}}+{{scope.row.SalesNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="UpdateDate" width="110" label="是否加入快速购买"> <el-table-column prop="UpdateDate" width="110" label="是否加入快速购买" v-if="currentUserInfo.IsKorea==0">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch @change="Edit(scope.row,10)" v-model="scope.row.IsQuickBuy" active-color="#409EFF" <el-switch @change="Edit(scope.row,10)" v-model="scope.row.IsQuickBuy" active-color="#409EFF"
:active-value="1" :inactive-value="0"> :active-value="1" :inactive-value="0">
...@@ -425,10 +426,12 @@ ...@@ -425,10 +426,12 @@
BuyGoodsNumState: true, BuyGoodsNumState: true,
BuyOrderNumState: true, BuyOrderNumState: true,
hpState: 0, hpState: 0,
FxState: 0 FxState: 0,
currentUserInfo: {}, //当前用户
} }
}, },
created() { created() {
this.currentUserInfo = JSON.parse(localStorage.mall_userInfo);
this.getList(); this.getList();
this.getTree(); this.getTree();
this.getRule(); this.getRule();
...@@ -577,8 +580,7 @@ ...@@ -577,8 +580,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.commonSet(msg); this.commonSet(msg);
}).catch(() => { }).catch(() => {});
});
}, },
Edit(row, num) { Edit(row, num) {
let addMsg = { let addMsg = {
...@@ -676,8 +678,7 @@ ...@@ -676,8 +678,7 @@
}, },
null null
); );
}).catch(() => { }).catch(() => {});
});
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -799,6 +800,7 @@ ...@@ -799,6 +800,7 @@
} }
}, },
}; };
</script> </script>
<style> <style>
.plxg .spmy .el-form-item__label { .plxg .spmy .el-form-item__label {
......
...@@ -622,6 +622,7 @@ ...@@ -622,6 +622,7 @@
userInfo.MallBaseId = item.MallBaseId; userInfo.MallBaseId = item.MallBaseId;
userInfo.MallName = item.MallName; userInfo.MallName = item.MallName;
userInfo.IsOpenSchool=item.IsOpenSchool; userInfo.IsOpenSchool=item.IsOpenSchool;
userInfo.IsKorea=item.IsKorea;
localStorage.mall_userInfo = JSON.stringify(userInfo); localStorage.mall_userInfo = JSON.stringify(userInfo);
}, },
//修改密码 //修改密码
......
...@@ -424,11 +424,6 @@ ...@@ -424,11 +424,6 @@
<el-switch :active-value="1" :inactive-value="0" v-model="msg.ListName"> <el-switch :active-value="1" :inactive-value="0" v-model="msg.ListName">
</el-switch> </el-switch>
</div> </div>
<div class="left_box ">
<span style="margin-right: 10px">商品价格</span>
<el-switch :active-value="1" :inactive-value="0" v-model="msg.IsShowPrice">
</el-switch>
</div>
</div> </div>
<div class="right-setting-menu"> <div class="right-setting-menu">
<div class="item-img"> <div class="item-img">
...@@ -900,7 +895,6 @@ ...@@ -900,7 +895,6 @@
ListShopCar: 0, ListShopCar: 0,
ListBuyCount: 1, ListBuyCount: 1,
ListName: 1, ListName: 1,
IsShowPrice:1,//是否显示商品价格
DetailsComment: 1, DetailsComment: 1,
DetailsLineationPrice: 1, DetailsLineationPrice: 1,
DetailsMemberPrice: 1, DetailsMemberPrice: 1,
......
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