diff --git a/ybf_admin/src/pages/in/contact/components/addStore.vue b/ybf_admin/src/pages/in/contact/components/addStore.vue
index 7c684b10e03cc6bc963ee751ade698f5fb87b156..432659ba6a9b0fced55137c4f68b1ddd58590be8 100644
--- a/ybf_admin/src/pages/in/contact/components/addStore.vue
+++ b/ybf_admin/src/pages/in/contact/components/addStore.vue
@@ -220,30 +220,6 @@ export default {
.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() {}
},
diff --git a/ybf_admin/src/pages/in/contact/index.vue b/ybf_admin/src/pages/in/contact/index.vue
index 5b9c1deaf4c12e13760d2cca52d054d197efdbfe..a6d3908798a07dbc2dc7dad62bf72fd34c2bb20f 100644
--- a/ybf_admin/src/pages/in/contact/index.vue
+++ b/ybf_admin/src/pages/in/contact/index.vue
@@ -18,7 +18,7 @@
</el-menu-item>
<el-menu-item index="3" @click="handleMenuChange('3')">
<span class="circle"><d2-icon-svg name="store"/></span>
- <span slot="title">门店管ç†</span>
+ <span slot="title">å“牌管ç†</span>
</el-menu-item>
</el-menu>
<!-- </div> -->
diff --git a/ybf_admin/src/pages/in/contact/store.vue b/ybf_admin/src/pages/in/contact/store.vue
index cc31ac7bb129fc280bd4202cf67ec194d86d3a4f..b70e8834147cec2aaa0cae2a229ac148873ea2ec 100644
--- a/ybf_admin/src/pages/in/contact/store.vue
+++ b/ybf_admin/src/pages/in/contact/store.vue
@@ -1,10 +1,10 @@
<template>
<div class="main">
- <div class="title">全部门店（ 共5个 ）</div>
+ <div class="title">全部å“牌（ å…±5个 ）</div>
<!-- æœç´¢åŒº -->
<div class="searchs">
<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>
</div>
@@ -38,9 +38,9 @@
height="calc(100vh - 360px)"
>
<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="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="name" label="å“牌å称" align="center"></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="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="signNum" label="门牌å·" align="center" width="120"></el-table-column>
@@ -69,8 +69,109 @@
<!-- 对è¯æ¡†åŒº -->
<div class="ztask-dialogs">
+ <!-- New -->
<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"
width="50%"
:before-close="dialogSeeClose"
@@ -79,24 +180,24 @@
<el-form :model="zdata.see" label-width="120px">
<el-row>
<el-col :span="24">
- <el-form-item label="门店å称：">
+ <el-form-item label="å“牌å称：">
<el-input
:disabled="true"
v-model="zdata.see.storeName"
autocomplete="off"
- placeholder="门店å称缺失"
+ placeholder="å“牌å称缺失"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="门店类型：">
+ <el-form-item label="å“牌类型：">
<el-input
:disabled="true"
v-model="zdata.see.storeType"
autocomplete="off"
- placeholder="门店类型为空"
+ placeholder="å“牌类型为空"
></el-input>
</el-form-item>
</el-col>
@@ -115,12 +216,12 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="门店负责人：">
+ <el-form-item label="å“牌负责人：">
<el-input
:disabled="true"
v-model="zdata.see.storeBossName"
autocomplete="off"
- placeholder="门店负责人未知"
+ placeholder="å“牌负责人未知"
></el-input>
</el-form-item>
</el-col>
@@ -154,9 +255,9 @@
<el-form-item label="店员：">
<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 prop="userName" 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="userName" 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>
</el-form-item>
</el-col>
@@ -170,8 +271,9 @@
</span>
</el-dialog>
+ <!-- Edit -->
<el-dialog
- title="编辑门店"
+ title="编辑å“牌"
:visible.sync="zcache.status.editDialog"
width="65%"
:before-close="dialogEditClose"
@@ -185,20 +287,20 @@
style="border: 0px solid red;"
>
<!-- <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
size="small"
v-model="zdata.editPost.storeName"
style="width:240px;"
- placeholder="请输入门店å称"
+ placeholder="请输入å“牌å称"
/>
</el-form-item>
- <el-form-item label="门店类型:" prop="storeType">
+ <el-form-item label="å“牌类型:" prop="storeType">
<el-select
size="small"
v-model="zdata.editPost.storeTypeId"
- placeholder="请选择门店类型"
+ placeholder="请选择å“牌类型"
style="width:240px"
>
<el-option
@@ -210,11 +312,11 @@
</el-select>
</el-form-item>
- <el-form-item label="门店负责人:" prop="people">
+ <el-form-item label="å“牌负责人:" prop="people">
<el-select
size="small"
v-model="zdata.editPost.storeBossId"
- placeholder="请选择门店负责人"
+ placeholder="请选择å“牌负责人"
style="width:240px"
>
<el-option
@@ -279,6 +381,7 @@ import {
ApiStoreGetStoreDetail,
ApiStoreDelStore,
ApiStoreGetUnGroupManList,
+ ApiStoreAddStore,
ApiStoreEditStore,
ApiStoreGetBarList,
ApiStoreSearch
@@ -295,6 +398,7 @@ export default {
return {
zcache: {
status: {
+ newDialog: false,
seeDialog: false,
editDialog: false,
isSearch: false
@@ -309,6 +413,22 @@ export default {
searchPost: {
keywords: ""
},
+ newPost: {
+ storeName: "",
+ storeTypeId: "",
+ storeBossId: "",
+ storeFromBarId: "",
+ storeDoorCode: "",
+ storeAddress: ""
+ },
+ newPostDefault: {
+ storeName: "",
+ storeTypeId: "",
+ storeBossId: "",
+ storeFromBarId: "",
+ storeDoorCode: "",
+ storeAddress: ""
+ },
see: {
storeName: "storeName",
storeType: "storeType",
@@ -494,9 +614,10 @@ export default {
watch: {
// addStoreDialog() {
addStoreDialog() {
- if ((this.$refs.addStore.addStoreDialog = false)) {
- this.storeGetMainList();
- }
+ // if ((this.$refs.addStore.addStoreDialog = false)) {
+ // this.storeGetMainList();
+ // }
+
},
"": {
handler: function() {},
@@ -600,11 +721,11 @@ export default {
this.zcache.page.nowPage = res.data.pageInfo_adminStalls.pageNum;
});
},
- storePageIndexChange(inData){
- console.log('--->page: inData =', inData)
- this.zcache.page.nowPage = inData
+ storePageIndexChange(inData) {
+ console.log("--->page: inData =", inData);
+ this.zcache.page.nowPage = inData;
- if(this.zcache.status.isSearch){
+ if (this.zcache.status.isSearch) {
let postData = {
keyWords: this.zdata.searchPost.keywords,
pageNum: inData
@@ -623,9 +744,9 @@ export default {
this.zcache.page.nowPage = res.data.pageInfo_adminStalls.pageNum;
})
.catch(err => {});
- }else{
- this.zcache.page.nowPage = inData
- this.storeGetMainList()
+ } else {
+ this.zcache.page.nowPage = inData;
+ this.storeGetMainList();
}
},
storeGetStoreDetail(inData) {
@@ -745,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() {
this.zcache.status.editDialog = false;
this.zdata.editPost = JSON.parse(
@@ -806,7 +969,8 @@ export default {
}
},
addStore() {
- this.$refs.addStore.addStoreDialog = true;
+ // this.$refs.addStore.addStoreDialog = true;
+ this.zcache.status.newDialog = true;
},
handleDetail() {
this.$refs.storeDetail.detailDialog = true;