Skip to content

Y
ybf
Commit 2d8dd839 authored by xd's avatar xd
Browse files
Options

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents b05613a1 1ae9114c
Show whitespace changes
Inline Side-by-side
Showing with 237 additions and 61 deletions
ybf_admin/src/pages/in/contact/components/addStore.vue
View file @ 2d8dd839
...@@ -220,30 +220,6 @@ export default { ...@@ -220,30 +220,6 @@ export default {
.catch(err => { .catch(err => {
}); });
// this.$refs[inDataName].validate(valid => {
// if (valid) {
// // this.addStoreDialog = false;
// let postData = {
// name: this.zdata.post.storeName,
// stallType: this.zdata.post.storeTypeId,
// principal: this.zdata.post.storeBossId,
// shopId: this.zdata.post.storeFromBarId,
// signNum: this.zdata.post.storeDoorCode,
// location: this.zdata.post.storeAddress
// };
// zlog("--->postData =", postData);
// // ApiStoreAddStore(postData)
// // .then(res => {})
// // .catch(err => {});
// } else {
// console.log("error submit!!");
// return false;
// }
// });
}, },
handleChange() {} handleChange() {}
}, },
......
ybf_admin/src/pages/in/contact/index.vue
View file @ 2d8dd839
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</el-menu-item> </el-menu-item>
<el-menu-item index="3" @click="handleMenuChange('3')"> <el-menu-item index="3" @click="handleMenuChange('3')">
<span class="circle"><d2-icon-svg name="store"/></span> <span class="circle"><d2-icon-svg name="store"/></span>
<span slot="title">门店管理</span> <span slot="title">品牌管理</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<!-- </div> --> <!-- </div> -->
......
ybf_admin/src/pages/in/contact/store.vue
View file @ 2d8dd839
<template> <template>
<div class="main"> <div class="main">
<div class="title">全部门店（ 共5个 ）</div> <div class="title">全部品牌（ 共5个 ）</div>
<!-- 搜索区 --> <!-- 搜索区 -->
<div class="searchs"> <div class="searchs">
<div class="buttons"> <div class="buttons">
<el-button class="button buttonlight" size="small" @click="addStore">添加门店</el-button> <el-button class="button buttonlight" size="small" @click="addStore">添加品牌</el-button>
<el-button class="button buttondark" size="small" @click="storeDelStoreArr">批量删除</el-button> <el-button class="button buttondark" size="small" @click="storeDelStoreArr">批量删除</el-button>
</div> </div>
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
height="calc(100vh - 360px)" height="calc(100vh - 360px)"
> >
<el-table-column type="selection" width="60"></el-table-column> <el-table-column type="selection" width="60"></el-table-column>
<el-table-column prop="name" label="门店名称" align="center"></el-table-column> <el-table-column prop="name" label="品牌名称" align="center"></el-table-column>
<el-table-column prop="type" label="门店类型" align="center" width="120"></el-table-column> <el-table-column prop="type" label="品牌类型" align="center" width="120"></el-table-column>
<el-table-column prop="principal" label="门店负责人" align="center" width="120"></el-table-column> <el-table-column prop="principal" label="品牌负责人" align="center" width="120"></el-table-column>
<el-table-column prop="shopId" label="所属柜组" align="center" width="120"></el-table-column> <el-table-column prop="shopId" label="所属柜组" align="center" width="120"></el-table-column>
<el-table-column prop="location" label="位置" align="center" width="120"></el-table-column> <el-table-column prop="location" label="位置" align="center" width="120"></el-table-column>
<el-table-column prop="signNum" label="门牌号" align="center" width="120"></el-table-column> <el-table-column prop="signNum" label="门牌号" align="center" width="120"></el-table-column>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<div class="pages"> <div class="pages">
<el-pagination <el-pagination
@current-change="handleCurrentChange" @current-change="storePageIndexChange"
:current-page="zcache.page.nowPage" :current-page="zcache.page.nowPage"
:page-size="zcache.page.pageSize" :page-size="zcache.page.pageSize"
layout="total, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
...@@ -69,8 +69,109 @@ ...@@ -69,8 +69,109 @@
<!-- 对话框区 --> <!-- 对话框区 -->
<div class="ztask-dialogs"> <div class="ztask-dialogs">
<!-- New -->
<el-dialog <el-dialog
title="门店详情" title="新建品牌"
:visible.sync="zcache.status.newDialog"
width="65%"
:before-close="dialogNewClose"
>
<div class="dialogMain">
<!-- <el-form :model="zdata.post" label-width="auto" ref="addStore" :rules="zrule"> -->
<el-form
:model="zdata.newPost"
label-width="auto"
ref="newStore"
style="border: 0px solid red;"
>
<!-- <el-form :model="zdata.post" label-width="auto" ref="createForm" :rules="rules"> -->
<el-form-item label="品牌名称:" prop="storeName">
<el-input
size="small"
v-model="zdata.newPost.storeName"
style="width:240px;"
placeholder="请输入品牌名称"
/>
</el-form-item>
<el-form-item label="品牌类型:" prop="storeType">
<el-select
size="small"
v-model="zdata.newPost.storeTypeId"
placeholder="请选择品牌类型"
style="width:240px"
>
<el-option
v-for="item in zlist.storeType"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="品牌负责人:" prop="people">
<el-select
size="small"
v-model="zdata.newPost.storeBossId"
placeholder="请选择品牌负责人"
style="width:240px"
>
<el-option
v-for="item in zlist.unGroupMan"
:key="item.id"
:label="item.userName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属柜组:" prop="counter">
<el-select
size="small"
v-model="zdata.newPost.storeFromBarId"
placeholder="请选择所属柜组"
style="width:240px"
>
<el-option
v-for="item in zlist.storeFromBarId"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="门牌号:" prop="number">
<el-input
size="small"
v-model="zdata.newPost.storeDoorCode"
style="width:240px"
placeholder="请输入门牌号"
/>
</el-form-item>
<el-form-item label="位置:" prop="area">
<el-input
size="small"
v-model="zdata.newPost.storeAddress"
style="width:240px"
placeholder="请输入位置"
/>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogNewCancel">取 消</el-button>
<!-- <el-button type="primary" @click="addStoreSubmit('createForm')" size="small">确 定</el-button> -->
<el-button type="primary" @click="dialogNewSubmit" size="small">确 定</el-button>
</span>
</el-dialog>
<!-- See -->
<el-dialog
title="品牌详情"
:visible.sync="zcache.status.seeDialog" :visible.sync="zcache.status.seeDialog"
width="50%" width="50%"
:before-close="dialogSeeClose" :before-close="dialogSeeClose"
...@@ -79,24 +180,24 @@ ...@@ -79,24 +180,24 @@
<el-form :model="zdata.see" label-width="120px"> <el-form :model="zdata.see" label-width="120px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="门店名称："> <el-form-item label="品牌名称：">
<el-input <el-input
:disabled="true" :disabled="true"
v-model="zdata.see.storeName" v-model="zdata.see.storeName"
autocomplete="off" autocomplete="off"
placeholder="门店名称缺失" placeholder="品牌名称缺失"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="门店类型："> <el-form-item label="品牌类型：">
<el-input <el-input
:disabled="true" :disabled="true"
v-model="zdata.see.storeType" v-model="zdata.see.storeType"
autocomplete="off" autocomplete="off"
placeholder="门店类型为空" placeholder="品牌类型为空"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -115,12 +216,12 @@ ...@@ -115,12 +216,12 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="门店负责人："> <el-form-item label="品牌负责人：">
<el-input <el-input
:disabled="true" :disabled="true"
v-model="zdata.see.storeBossName" v-model="zdata.see.storeBossName"
autocomplete="off" autocomplete="off"
placeholder="门店负责人未知" placeholder="品牌负责人未知"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -154,9 +255,9 @@ ...@@ -154,9 +255,9 @@
<el-form-item label="店员："> <el-form-item label="店员：">
<el-table class="list" :data="zdata.see.storeManList" tooltip-effect="dark"> <el-table class="list" :data="zdata.see.storeManList" tooltip-effect="dark">
<el-table-column type="index" width="50" align="center"></el-table-column> <el-table-column type="index" width="50" align="center"></el-table-column>
<el-table-column prop="userName" label="门店名称" align="center"></el-table-column> <el-table-column prop="userName" label="品牌名称" align="center"></el-table-column>
<el-table-column prop="userId" label="门店类型" align="center"></el-table-column> <el-table-column prop="userId" label="品牌类型" align="center"></el-table-column>
<el-table-column prop="mobile" label="门店类型" align="center"></el-table-column> <el-table-column prop="mobile" label="品牌类型" align="center"></el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -170,8 +271,9 @@ ...@@ -170,8 +271,9 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- Edit -->
<el-dialog <el-dialog
title="编辑门店" title="编辑品牌"
:visible.sync="zcache.status.editDialog" :visible.sync="zcache.status.editDialog"
width="65%" width="65%"
:before-close="dialogEditClose" :before-close="dialogEditClose"
...@@ -185,20 +287,20 @@ ...@@ -185,20 +287,20 @@
style="border: 0px solid red;" style="border: 0px solid red;"
> >
<!-- <el-form :model="zdata.post" label-width="auto" ref="createForm" :rules="rules"> --> <!-- <el-form :model="zdata.post" label-width="auto" ref="createForm" :rules="rules"> -->
<el-form-item label="门店名称:" prop="storeName"> <el-form-item label="品牌名称:" prop="storeName">
<el-input <el-input
size="small" size="small"
v-model="zdata.editPost.storeName" v-model="zdata.editPost.storeName"
style="width:240px;" style="width:240px;"
placeholder="请输入门店名称" placeholder="请输入品牌名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="门店类型:" prop="storeType"> <el-form-item label="品牌类型:" prop="storeType">
<el-select <el-select
size="small" size="small"
v-model="zdata.editPost.storeTypeId" v-model="zdata.editPost.storeTypeId"
placeholder="请选择门店类型" placeholder="请选择品牌类型"
style="width:240px" style="width:240px"
> >
<el-option <el-option
...@@ -210,11 +312,11 @@ ...@@ -210,11 +312,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="门店负责人:" prop="people"> <el-form-item label="品牌负责人:" prop="people">
<el-select <el-select
size="small" size="small"
v-model="zdata.editPost.storeBossId" v-model="zdata.editPost.storeBossId"
placeholder="请选择门店负责人" placeholder="请选择品牌负责人"
style="width:240px" style="width:240px"
> >
<el-option <el-option
...@@ -279,6 +381,7 @@ import { ...@@ -279,6 +381,7 @@ import {
ApiStoreGetStoreDetail, ApiStoreGetStoreDetail,
ApiStoreDelStore, ApiStoreDelStore,
ApiStoreGetUnGroupManList, ApiStoreGetUnGroupManList,
ApiStoreAddStore,
ApiStoreEditStore, ApiStoreEditStore,
ApiStoreGetBarList, ApiStoreGetBarList,
ApiStoreSearch ApiStoreSearch
...@@ -295,6 +398,7 @@ export default { ...@@ -295,6 +398,7 @@ export default {
return { return {
zcache: { zcache: {
status: { status: {
newDialog: false,
seeDialog: false, seeDialog: false,
editDialog: false, editDialog: false,
isSearch: false isSearch: false
...@@ -309,6 +413,22 @@ export default { ...@@ -309,6 +413,22 @@ export default {
searchPost: { searchPost: {
keywords: "" keywords: ""
}, },
newPost: {
storeName: "",
storeTypeId: "",
storeBossId: "",
storeFromBarId: "",
storeDoorCode: "",
storeAddress: ""
},
newPostDefault: {
storeName: "",
storeTypeId: "",
storeBossId: "",
storeFromBarId: "",
storeDoorCode: "",
storeAddress: ""
},
see: { see: {
storeName: "storeName", storeName: "storeName",
storeType: "storeType", storeType: "storeType",
...@@ -494,13 +614,14 @@ export default { ...@@ -494,13 +614,14 @@ export default {
watch: { watch: {
// addStoreDialog() { // addStoreDialog() {
addStoreDialog() { addStoreDialog() {
if ((this.$refs.addStore.addStoreDialog = false)) { // if ((this.$refs.addStore.addStoreDialog = false)) {
this.storeGetMainList(); // this.storeGetMainList();
} // }
}, },
'':{ "": {
handler: function(){}, handler: function() {},
deep: true, deep: true
} }
}, },
// created() { // created() {
...@@ -571,7 +692,13 @@ export default { ...@@ -571,7 +692,13 @@ export default {
// let result = []; // let result = [];
// result.push(res.data.stallInfo); // result.push(res.data.stallInfo);
// this.list.main = result; // this.list.main = result;
this.list.main = res.data.list // this.list.main = res.data.list;
this.list.main = res.data.pageInfo_adminStalls.list;
this.zcache.page.allItem = Number(
res.data.pageInfo_adminStalls.total
);
this.zcache.page.pageSize = res.data.pageInfo_adminStalls.pageSize;
this.zcache.page.nowPage = res.data.pageInfo_adminStalls.pageNum;
}) })
.catch(err => {}); .catch(err => {});
} }
...@@ -583,15 +710,45 @@ export default { ...@@ -583,15 +710,45 @@ export default {
}; };
ApiStoreGetMainList(postData).then(res => { ApiStoreGetMainList(postData).then(res => {
this.list.main = res.data.pageInfo_adminStalls.list[0]; // this.list.main = res.data.pageInfo_adminStalls.list[0];
this.list.man = res.data.pageInfo_principals.list[0]; // this.list.man = res.data.pageInfo_principals.list[0];
this.list.main = res.data.pageInfo_adminStalls.list;
this.list.man = res.data.adminStall_principals;
this.transManIdToManName(); this.transManIdToManName();
this.zcache.page.allItem = Number(res.data.pageInfo_adminStalls.total) this.zcache.page.allItem = Number(res.data.pageInfo_adminStalls.total);
this.zcache.page.pageSize = res.data.pageInfo_adminStalls.pageSize this.zcache.page.pageSize = res.data.pageInfo_adminStalls.pageSize;
this.zcache.page.nowPage = res.data.pageInfo_adminStalls.pageNum this.zcache.page.nowPage = res.data.pageInfo_adminStalls.pageNum;
}); });
}, },
storePageIndexChange(inData) {
console.log("--->page: inData =", inData);
this.zcache.page.nowPage = inData;
if (this.zcache.status.isSearch) {
let postData = {
keyWords: this.zdata.searchPost.keywords,
pageNum: inData
};
ApiStoreSearch(postData)
.then(res => {
// let result = [];
// result.push(res.data.stallInfo);
// this.list.main = result;
// this.list.main = res.data.list;
this.list.main = res.data.pageInfo_adminStalls.list;
this.zcache.page.allItem = Number(
res.data.pageInfo_adminStalls.total
);
this.zcache.page.pageSize = res.data.pageInfo_adminStalls.pageSize;
this.zcache.page.nowPage = res.data.pageInfo_adminStalls.pageNum;
})
.catch(err => {});
} else {
this.zcache.page.nowPage = inData;
this.storeGetMainList();
}
},
storeGetStoreDetail(inData) { storeGetStoreDetail(inData) {
let postData = { let postData = {
isDetail: true, isDetail: true,
...@@ -709,6 +866,48 @@ export default { ...@@ -709,6 +866,48 @@ export default {
}); });
}, },
dialogNewClose() {
this.zcache.status.newDialog = false;
this.zdata.newPost = JSON.parse(
JSON.stringify(this.zdata.newPostDefault)
);
},
dialogNewCancel() {
this.zcache.status.newDialog = false;
this.zdata.newPost = JSON.parse(
JSON.stringify(this.zdata.newPostDefault)
);
},
dialogNewSubmit() {
let postData = {
name: this.zdata.newPost.storeName,
stallType: Number(this.zdata.newPost.storeTypeId),
principal: Number(this.zdata.newPost.storeBossId),
shopId: this.zdata.newPost.storeFromBarId,
signNum: this.zdata.newPost.storeDoorCode,
location: this.zdata.newPost.storeAddress
};
console.log("--->postData =", postData);
ApiStoreAddStore(postData)
.then(res => {
if (res.result == "success") {
this.$message({
message: "添加成功",
type: "success"
});
this.zcache.status.newDialog = false;
this.zdata.newPost = JSON.parse(
JSON.stringify(this.zdata.newPostDefault)
);
this.storeSearch();
}
})
.catch(err => {});
},
dialogEditClose() { dialogEditClose() {
this.zcache.status.editDialog = false; this.zcache.status.editDialog = false;
this.zdata.editPost = JSON.parse( this.zdata.editPost = JSON.parse(
...@@ -770,7 +969,8 @@ export default { ...@@ -770,7 +969,8 @@ export default {
} }
}, },
addStore() { addStore() {
this.$refs.addStore.addStoreDialog = true; // this.$refs.addStore.addStoreDialog = true;
this.zcache.status.newDialog = true;
}, },
handleDetail() { handleDetail() {
this.$refs.storeDetail.detailDialog = true; this.$refs.storeDetail.detailDialog = true;
......
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