Skip to content

M
marketing
Commit 7c5c6ca2 by huaying
Options

fix: dd

parent a79fb4ef
Showing with 64 additions and 27 deletions
package-lock.json
......@@ -12954,6 +12954,11 @@
"resolved": "https://registry.npmjs.org/scriptjs/-/scriptjs-2.5.9.tgz",
"integrity": "sha512-qGVDoreyYiP1pkQnbnFAUIS5AjenNwwQBdl7zeos9etl+hYKWahjRTfzAZZYBv5xNHx7vNKCmaLDQZ6Fr2AEXg=="
},
"scrollparent": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/scrollparent/-/scrollparent-2.0.1.tgz",
"integrity": "sha512-HSdN78VMvFCSGCkh0oYX/tY4R3P1DW61f8+TeZZ4j2VLgfwvw0bpRSOv4PCVKisktIwbzHCfZsx+rLbbDBqIBA=="
},
"scss-tokenizer": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
......@@ -14869,6 +14874,11 @@
}
}
},
"vue-observe-visibility": {
"version": "0.4.6",
"resolved": "https://registry.npmmirror.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
},
"vue-qr": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/vue-qr/-/vue-qr-1.5.3.tgz",
......@@ -14878,6 +14888,11 @@
"vue": "^2.5.16"
}
},
"vue-resize": {
"version": "0.4.5",
"resolved": "https://registry.npmmirror.com/vue-resize/-/vue-resize-0.4.5.tgz",
"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
},
"vue-router": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz",
......@@ -14914,6 +14929,16 @@
"resolved": "https://registry.npmjs.org/vue-ueditor-wrap/-/vue-ueditor-wrap-1.5.0.tgz",
"integrity": "sha512-5UzMJG/2Ckbmnb97qhdwgCOPi4d+qma7arZ+l8ZTKI+du5lEU39moA6I3sJmZAWrci9ENF19ItHATDREmQzWeg=="
},
"vue-virtual-scroller": {
"version": "1.0.10",
"resolved": "https://registry.npmmirror.com/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz",
"integrity": "sha512-Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA==",
"requires": {
"scrollparent": "^2.0.1",
"vue-observe-visibility": "^0.4.4",
"vue-resize": "^0.4.5"
}
},
"vue2-editor": {
"version": "2.10.3",
"resolved": "https://registry.npmjs.org/vue2-editor/-/vue2-editor-2.10.3.tgz",
......
src/service/api/cardApi.js
......@@ -196,7 +196,7 @@ export const listConsumeCouponDetail = params => requests(PREFIX + '/list-consum
export const isAolai = params => requests(PREFIX + '/is-aolai', params);
// 核销门店列表
export const getStoreList = params => requests(PREFIX + 'page-write-off-store', params);
export const getStoreList = params => requests(PREFIX + 'write-off-store-page', params);
// 核销工具二维码
export const getwriteOffQr = params => requests(PREFIX + 'card-write-off-qrcode', params);
// 删除门店
......
src/views/card/addStoreDialog.vue
......@@ -39,7 +39,6 @@ export default {
},
async saving() {
this.storedata = await this.$refs.se.getList();
console.log(this.storedata, 'this.storedata');
},
submit() {
this.loadings = true;
......@@ -56,8 +55,9 @@ export default {
};
return para;
});
await addStore(res)
.then(() => {
await addStore({ ...res })
.then(res => {
console.log(res, 'res');
this.loadings = false;
this.handleClose();
})
......@@ -74,7 +74,7 @@ export default {
}
};
</script>
<style lang="scss">
<style lang="scss" scoped>
.el-dialog__footer {
border-top: none;
padding: 20px 20px 20px 0;
......
src/views/card/setStaffDialog.vue
<template>
<el-dialog :title="row.writeOffStoreStaffId ? '新增员工' : '编辑员工'" :visible.sync="show" width="600px" :before-close="handleClose">
<el-dialog :title="row.writeOffStoreStaffId ? '编辑员工' : '新增员工'" :visible.sync="show" width="600px" :before-close="handleClose">
<el-form :model="form" ref="form" :rules="rules" label-width="100px">
<el-form-item label="员工姓名：" prop="writeOffName">
<el-input class="w304" v-model="form.writeOffName" placeholder="请输入内容" maxlength="10" show-word-limit></el-input>
......@@ -21,7 +21,7 @@
<script>
// import { ElPhoneNumberInput } from 'el-writeOffPhone-number-input';
import { setStraff, searchRePhone } from '@/service/api/cardApi.js';
import { setStraff } from '@/service/api/cardApi.js';
export default {
// components: {
// ElPhoneNumberInput
......@@ -68,6 +68,18 @@ export default {
{
value: '1',
label: '中国 +86'
},
{
value: '2',
label: '澳门 +853'
},
{
value: '3',
label: '香港 +852'
},
{
value: '4',
label: '台湾 +886'
}
],
rePhone: false
......@@ -80,24 +92,24 @@ export default {
},
methods: {
async phoneChange(e) {
console.log(e);
await searchRePhone(e).then(res => {
if (res.result.errorCode == 0) {
this.rePhone = res.result.result;
}
});
// await searchRePhone(e).then(res => {
// if (res.result.errorCode == 0) {
// this.rePhone = res.result.result;
// }
// });
},
handleClose() {
this.$refs.form.clearValidate();
this.$nextTick(_ => {
this.$emit('update:show', false);
this.$emit('refresh');
});
},
submit() {
this.loadings = true;
this.$refs.from.validate(async valid => {
this.$refs.form.validate(async valid => {
if (valid) {
if (this.form.writeOffStoreStaffId == '') {
if (!this.form.writeOffStoreStaffId) {
delete this.form.writeOffStoreStaffId;
}
await setStraff(this.form)
......@@ -119,13 +131,13 @@ export default {
watch: {
row: {
handler: function(val) {
if (!(typeof val == 'string')) {
if (val.writeOffStoreStaffId) {
this.form.writeOffName = this.row.writeOffName;
this.form.writeOffPhone = this.row.writeOffPhone;
this.form.storeId = this.row.storeId;
this.form.writeOffStoreStaffId = this.row.writeOffStoreStaffId;
} else {
this.form.storeId = val;
this.form.storeId = val.storeId;
}
},
immediate: true
......
src/views/card/store-list.vue
......@@ -21,7 +21,7 @@
</div>
</div>
<div class="c_t_right">
<el-button type="text" style="margin-right: 12px;" @click="setStraffEvent(item.storeId)">新增员工</el-button>
<el-button type="text" style="margin-right: 12px;" @click="setStraffEvent({ storeId: item.storeId })">新增员工</el-button>
<el-popconfirm confirm-button-text="删除" cancel-button-text="取消" icon="el-icon-warning" icon-color="#FA8C16" style="margin-left:6px" @confirm="deleteStoreEvent(row)" title="删除后卡券适用门店无法选择，是否继续？">
<el-button slot="reference" type="text">删除</el-button>
</el-popconfirm>
......@@ -46,8 +46,8 @@
<dm-pagination v-show="tableData.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</div>
<links :src="linkUrl" :show.sync="linkShow" :imageName="核销工具二维码" />
<add-store-dialog :show.sync="addStoreShow"></add-store-dialog>
<set-staff-dialog :show.sync="setStraffShow" :row="straffDetail"></set-staff-dialog>
<add-store-dialog :show.sync="addStoreShow" @refresh="getList"></add-store-dialog>
<set-staff-dialog :show.sync="setStraffShow" :row="straffDetail" @refresh="getList"></set-staff-dialog>
</div>
</template>
......@@ -73,7 +73,7 @@ export default {
},
total: 0,
linkShow: false,
linkUrl: 'pages/page-transit/page-transit-qy?scene=ff80808182a5de710182a5fd8e290016',
linkUrl: 'api-marketing/card-write-off-qrcode',
addStoreShow: false,
setStraffShow: false,
straffDetail: {}
......@@ -146,12 +146,12 @@ export default {
};
</script>
<style lang="scss">
.el-popconfirm__main {
margin-bottom: 16px;
}
.el-popper {
max-width: 251px;
}
// .el-popconfirm__main {
// margin-bottom: 16px;
// }
// .el-popper {
// max-width: 251px;
// }
// .damolish .el-button.el-button--mini {
// border: 1px solid #DCDFE6;
// color: #303133;
......
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