menjin
/
renli-pc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.40:10101/r/Demay_New

Browse Source
master
Sigo 4 years ago
parent e1c0af5527 7a148311af
commit 724d82f533
8 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File

BIN
dist.rar
View File

Binary file not shown.

1
src/components/staffList/staff/index.vue
Unescape Escape View File

@ -108,7 +108,6 @@ export default {
}, },
//组件传值 //组件传值
show(list, storeId) { show(list, storeId) {
console.log(list);
this.staffLists = [...list]; this.staffLists = [...list];
this.staffLists.forEach((item) => { this.staffLists.forEach((item) => {
if (item.id || item.staffId) { if (item.id || item.staffId) {

46
src/layout/components/asider.vue
Unescape Escape View File

@ -156,14 +156,14 @@ export default {
icon: "el-icon-s-check", icon: "el-icon-s-check",
route: "/alliance", route: "/alliance",
index: "alliance", index: "alliance",
number: "400810", number: "4008100",
}, },
{ {
name: "物资", name: "物资",
icon: "el-icon-s-ticket", icon: "el-icon-s-ticket",
route: "/materials", route: "/materials",
index: "materials", index: "materials",
number: "400810", number: "4008100",
}, },
{ {
@ -576,119 +576,119 @@ export default {
icon: "el-icon-info", icon: "el-icon-info",
route: "/recommend", route: "/recommend",
index: "recommend", index: "recommend",
number: "600200", number: "6001100",
}, },
{ {
name: "人均单价", name: "人均单价",
icon: "el-icon-s-finance", icon: "el-icon-s-finance",
route: "/perCapita", route: "/perCapita",
index: "perCapita", index: "perCapita",
number: "600200", number: "6001100",
}, },
{ {
name: "活动排行榜", name: "活动排行榜",
icon: "el-icon-s-cooperation", icon: "el-icon-s-cooperation",
route: "/activity", route: "/activity",
index: "activity", index: "activity",
number: "600200", number: "6001100",
}, },
{ {
name: "计划达成", name: "计划达成",
icon: "el-icon-s-flag", icon: "el-icon-s-flag",
route: "/achieve", route: "/achieve",
index: "achieve", index: "achieve",
number: "600200", number: "6001100",
}, },
{ {
name: "商城营收", name: "商城营收",
icon: "el-icon-s-marketing", icon: "el-icon-s-marketing",
route: "/turnover", route: "/turnover",
index: "turnover", index: "turnover",
number: "600200", number: "6001100",
}, },
{ {
name: "商品营收", name: "商品营收",
icon: "el-icon-s-flag", icon: "el-icon-s-flag",
route: "/commodity", route: "/commodity",
index: "commodity", index: "commodity",
number: "600200", number: "6001100",
}, },
{ {
name: "新增会员", name: "新增会员",
icon: "el-icon-s-custom", icon: "el-icon-s-custom",
route: "/addMember", route: "/addMember",
index: "addMember", index: "addMember",
number: "600200", number: "6001100",
}, },
{ {
name: "离职率", name: "离职率",
icon: "el-icon-finished", icon: "el-icon-finished",
route: "/separation", route: "/separation",
index: "separation", index: "separation",
number: "600200", number: "6001100",
}, },
{ {
name: "费用清单", name: "费用清单",
icon: "el-icon-tickets", icon: "el-icon-tickets",
route: "/expenses", route: "/expenses",
index: "expenses", index: "expenses",
number: "600200", number: "6001100",
}, },
{ {
name: "结算", name: "结算",
icon: "el-icon-document", icon: "el-icon-document",
route: "/account", route: "/account",
index: "account", index: "account",
number: "600200", number: "6001100",
}, },
{ {
name: "活动效率比", name: "活动效率比",
icon: "el-icon-takeaway-box", icon: "el-icon-takeaway-box",
route: "/efficiency", route: "/efficiency",
index: "efficiency", index: "efficiency",
number: "600200", number: "6001100",
}, },
{ {
name: "活动新会员", name: "活动新会员",
icon: "el-icon-user", icon: "el-icon-user",
route: "/activityNew", route: "/activityNew",
index: "activityNew", index: "activityNew",
number: "600200", number: "6001100",
}, },
{ {
name: "服务年限", name: "服务年限",
icon: "el-icon-more-outline", icon: "el-icon-more-outline",
route: "/seniority", route: "/seniority",
index: "seniority", index: "seniority",
number: "600200", number: "6001100",
}, },
{ {
name: "会员时长", name: "会员时长",
icon: "el-icon-s-platform", icon: "el-icon-s-platform",
route: "/memberTime", route: "/memberTime",
index: "memberTime", index: "memberTime",
number: "600200", number: "6001100",
}, },
{ {
name: "创收", name: "创收",
icon: "el-icon-s-platform", icon: "el-icon-s-platform",
route: "/income", route: "/income",
index: "income", index: "income",
number: "600200", number: "6001100",
}, },
{ {
name: "合作费用", name: "合作费用",
icon: "el-icon-s-finance", icon: "el-icon-s-finance",
route: "/collaboration", route: "/collaboration",
index: "collaboration", index: "collaboration",
number: "600200", number: "6001100",
}, },
{ {
name: "合作费用支付", name: "合作费用支付",
icon: "el-icon-s-claim", icon: "el-icon-s-claim",
route: "/verification", route: "/verification",
index: "verification", index: "verification",
number: "600200", number: "6001100",
}, },
{ {
@ -755,28 +755,28 @@ export default {
name: "优惠券", name: "优惠券",
index: "100", index: "100",
icon: "el-icon-s-ticket", icon: "el-icon-s-ticket",
number: "400", number: "1000",
menuLists: [ menuLists: [
{ {
name: "发布", name: "发布",
icon: "el-icon-s-promotion", icon: "el-icon-s-promotion",
route: "/couponIssue", route: "/couponIssue",
index: "couponIssue", index: "couponIssue",
number: "400100", number: "1000100",
}, },
{ {
name: "管理", name: "管理",
icon: "el-icon-s-operation", icon: "el-icon-s-operation",
route: "/couponMane", route: "/couponMane",
index: "couponMane", index: "couponMane",
number: "400100", number: "1000200",
}, },
{ {
name: "领取消费", name: "领取消费",
icon: "el-icon-time", icon: "el-icon-time",
route: "/couponRecord", route: "/couponRecord",
index: "couponRecord", index: "couponRecord",
number: "400100", number: "1000300",
}, },
], ],
}, },

10
src/pages/eashier/proceeds/components/edit.vue
Unescape Escape View File

@ -1206,6 +1206,9 @@ export default {
this.recListCopy.forEach((item) => { this.recListCopy.forEach((item) => {
list.forEach((items) => { list.forEach((items) => {
if (item.id == items.id) { if (item.id == items.id) {
console.log(item);
console.log(item.giftConsumeMoney);
console.log(item.giftSpendMoney);
item.cardOver = (item.cardOver + items.spendMoney).toFixed(2) * 1; item.cardOver = (item.cardOver + items.spendMoney).toFixed(2) * 1;
item.cardOvers = (item.cardOvers + items.spendMoney).toFixed(2) * 1; item.cardOvers = (item.cardOvers + items.spendMoney).toFixed(2) * 1;
item.cardGiftOvers = item.cardGiftOvers =
@ -1658,11 +1661,6 @@ export default {
this.list.forEach((item) => { this.list.forEach((item) => {
let debtMoney = 0; let debtMoney = 0;
if (item.amount && item.courseAccountId == null) { if (item.amount && item.courseAccountId == null) {
console.log(item.amount);
console.log(item.collectionCashAmount);
console.log(item.collRecAmonnt);
console.log(item.collectionIntegralAmount);
debtMoney = debtMoney =
( (
item.amount - item.amount -
@ -1673,7 +1671,6 @@ export default {
money += debtMoney; money += debtMoney;
} }
}); });
console.log(money);
this.form.cashAmount = money.toFixed(2) * 1; this.form.cashAmount = money.toFixed(2) * 1;
this.list.forEach((item) => { this.list.forEach((item) => {
if ( if (
@ -1762,6 +1759,7 @@ export default {
}); });
return sums; return sums;
}, },
notData() { notData() {
Object.assign(this.$data, this.$options.data.call(this)); Object.assign(this.$data, this.$options.data.call(this));
var that = this; var that = this;

14
src/pages/eashier/reatment/reatment.vue
Unescape Escape View File

@ -237,10 +237,20 @@
<el-button @click.stop="openPostpone(scope.row, (postponeDialog = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success">账户延期</el-button> <el-button @click.stop="openPostpone(scope.row, (postponeDialog = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success">账户延期</el-button>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column align="center" fixed="right" label="操作" width="220"> <el-table-column align="center" fixed="right" label="明细" width="76">
<template slot-scope="scope" fixed="right"> <template slot-scope="scope">
<el-button size="mini" type="primary" @click="detail(scope.row)" plain>明细</el-button> <el-button size="mini" type="primary" @click="detail(scope.row)" plain>明细</el-button>
</el-button>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="作废" width="76">
<template slot-scope="scope">
<el-button @click.stop="abolish(scope.row)" size="mini" :disabled="scope.row.isCancel === 1" type="primary" v-role="5004003">作废</el-button> <el-button @click.stop="abolish(scope.row)" size="mini" :disabled="scope.row.isCancel === 1" type="primary" v-role="5004003">作废</el-button>
</el-button>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="打印" width="76">
<template slot-scope="scope">
<el-button @click.stop="print(scope.row, (printDialogVisible = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success" v-role="5004004">打印 <el-button @click.stop="print(scope.row, (printDialogVisible = true))" :disabled="scope.row.isCancel === 1" size="mini" type="success" v-role="5004004">打印
</el-button> </el-button>
</template> </template>

3
src/pages/eashier/refundCourse/refundCourse.vue
Unescape Escape View File

@ -1110,7 +1110,6 @@ export default {
refundOrderId: this.radiorefValueList.id, refundOrderId: this.radiorefValueList.id,
}).then((res) => { }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
this.reset();
if (res.rows.length == 0) { if (res.rows.length == 0) {
this.$alert("未找到相关明细", "提示", { this.$alert("未找到相关明细", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -1153,7 +1152,7 @@ export default {
selectOne({ selectOne({
type: 5, type: 5,
orderNum: this.refund.refundNum, orderNum: this.refund.refundNum,
storeId: this.radioListsValueList.storeId, storeId: this.radiorefValueList.storeId,
}).then((res) => { }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
let managerList = []; let managerList = [];

7
src/pages/eashier/refundRecharge/refundRecharge.vue
Unescape Escape View File

@ -2,7 +2,6 @@
<div class="rech"> <div class="rech">
<el-form :model="refund" inline :label-width="formWidth"> <el-form :model="refund" inline :label-width="formWidth">
<el-form-item prop="rechPhone" label="手机号码:"> <el-form-item prop="rechPhone" label="手机号码:">
<div class="form-width-ms"> <div class="form-width-ms">
<el-input style="padding-left:0px;" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="refund.mobilePhone" @change="memberOne" @blur="memberOne"> <el-input style="padding-left:0px;" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="refund.mobilePhone" @change="memberOne" @blur="memberOne">
@ -150,7 +149,7 @@
<!-- 状态 0:添加/1:送审/2:回收/3:审核/4:反审核 --> <!-- 状态 0:添加/1:送审/2:回收/3:审核/4:反审核 -->
<el-button type="danger" size="mini" @click="delOrder()" v-if="radiorefValueList.state==0">删除</el-button> <el-button type="danger" size="mini" @click="delOrder()" v-if="radiorefValueList.state==0">删除</el-button>
<el-button @click="detail()" :disabled="radiorefValueList.state==undefined " size="mini" type="primary" plain>明细</el-button> <el-button @click="detail()" :disabled="radiorefValueList.state==undefined " size="mini" type="primary" plain>明细</el-button>
<el-button @click="editOrder(formDialog=true,title='修改')" :disabled="radiorefValueList.state==undefined||radiorefValueList.state==5 ||radiorefValueList.state==1 || radiorefValueList.state==3" size="mini" type="primary" plain v-role='5005003'>修改</el-button> <el-button @click="editOrder(title='修改')" :disabled="radiorefValueList.state==undefined||radiorefValueList.state==5 ||radiorefValueList.state==1 || radiorefValueList.state==3" size="mini" type="primary" plain v-role='5005003'>修改</el-button>
<el-button @click="SendAudit" size="mini" type="primary" :disabled="radiorefValueList.state==3||radiorefValueList.state==5 ||radiorefValueList.state==1 ||radiorefValueList.state==undefined" v-role='5005004'>送审</el-button> <el-button @click="SendAudit" size="mini" type="primary" :disabled="radiorefValueList.state==3||radiorefValueList.state==5 ||radiorefValueList.state==1 ||radiorefValueList.state==undefined" v-role='5005004'>送审</el-button>
<el-button @click="recycle" size="mini" type="primary" :disabled="radiorefValueList.state==0||radiorefValueList.state==5||radiorefValueList.state==2||radiorefValueList.state==3||radiorefValueList.state==4||radiorefValueList.state==undefined" plain v-role='5005005'>回收</el-button> <el-button @click="recycle" size="mini" type="primary" :disabled="radiorefValueList.state==0||radiorefValueList.state==5||radiorefValueList.state==2||radiorefValueList.state==3||radiorefValueList.state==4||radiorefValueList.state==undefined" plain v-role='5005005'>回收</el-button>
<el-button v-if="headOffice==1" @click="audit" size="mini" type="primary" :disabled="radiorefValueList.state==2||radiorefValueList.state==5||radiorefValueList.state==3 || radiorefValueList.state==0|| radiorefValueList.state==4||radiorefValueList.state==undefined" v-role='5005006'>审核</el-button> <el-button v-if="headOffice==1" @click="audit" size="mini" type="primary" :disabled="radiorefValueList.state==2||radiorefValueList.state==5||radiorefValueList.state==3 || radiorefValueList.state==0|| radiorefValueList.state==4||radiorefValueList.state==undefined" v-role='5005006'>审核</el-button>
@ -1262,7 +1261,7 @@ export default {
refundOrderId: this.radiorefValueList.id, refundOrderId: this.radiorefValueList.id,
}).then((res) => { }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
this.reset(); this.formDialog = true;
if (res.pageInfo.total == 0) { if (res.pageInfo.total == 0) {
this.$alert("未找到相关明细", "提示", { this.$alert("未找到相关明细", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -1299,7 +1298,7 @@ export default {
selectOne({ selectOne({
type: 4, type: 4,
orderNum: this.refund.refundNum, orderNum: this.refund.refundNum,
storeId: this.radioListsValueList.storeId, storeId: this.radiorefValueList.storeId,
}).then((res) => { }).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
let managerList = []; let managerList = [];

1
src/pages/promotion/sellpacking/sellpackingTable.vue
Unescape Escape View File

@ -45,7 +45,6 @@
<el-table-column prop="amount" label="销售价格" align="center" min-width="80"></el-table-column> <el-table-column prop="amount" label="销售价格" align="center" min-width="80"></el-table-column>
<el-table-column prop="debtMoney" label="欠款金额" align="center" min-width="80"></el-table-column> <el-table-column prop="debtMoney" label="欠款金额" align="center" min-width="80"></el-table-column>
<el-table-column prop="storeName" label="门店名称" align="center" min-width="80"></el-table-column> <el-table-column prop="storeName" label="门店名称" align="center" min-width="80"></el-table-column>
<el-table-column label="明细" align="center" width="76" fixed="right"> <el-table-column label="明细" align="center" width="76" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" plain @click="detail(scope.row)">明细</el-button> <el-button size="mini" type="primary" plain @click="detail(scope.row)">明细</el-button>

Write Preview
Loading…
Cancel
Save