diff --git a/config/index.js b/config/index.js
index eb173e0..0cca9a8 100644
--- a/config/index.js
+++ b/config/index.js
@@ -26,9 +26,9 @@ module.exports = {
assetsPublicPath: "/",
proxyTable: {
"/api": {
- target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+ // target: "http://192.168.31.214:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
//target: "http://192.168.31.209:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
- // target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
+ target: "http://192.168.31.201:8084/", //设置你调用的接口域名和端口号 别忘了加http 本地
// target: "http://139.9.185.131:8098/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式
// target: "http://139.9.58.205:8084/", //设置你调用的接口域名和端口号 别忘了加http 天懿达正式华为云
// target: "http://139.9.185.131:9094/", //设置你调用的接口域名和端口号 别忘了加http 盛联
@@ -46,7 +46,7 @@ module.exports = {
}
},
// Various Dev Server settingsss
- host: "192.168.31.193", // can be overwritten by process.env.HOST
+ host: "192.168.31.194", // can be overwritten by process.env.HOST
port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
diff --git a/src/components/staffList/staffout/index.vue b/src/components/staffList/staffout/index.vue
new file mode 100644
index 0000000..9afad78
--- /dev/null
+++ b/src/components/staffList/staffout/index.vue
@@ -0,0 +1,298 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.ratio }}
+
+
+
+
+
+
+
+ 撤销
+ 增加
+
+
+
+
+
+
+
+
diff --git a/src/components/staffList/staffout/员工装出疗程占比选值 b/src/components/staffList/staffout/员工装出疗程占比选值
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/staffList/staffout/员工转出占比选值 b/src/components/staffList/staffout/员工转出占比选值
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/eashier/coursetorec/components/detail.vue b/src/pages/eashier/coursetorec/components/detail.vue
index 5cd2990..031e759 100644
--- a/src/pages/eashier/coursetorec/components/detail.vue
+++ b/src/pages/eashier/coursetorec/components/detail.vue
@@ -19,8 +19,8 @@
-
-
+
+
@@ -28,6 +28,12 @@
+
+ 员工
+
+
+
+
@@ -44,7 +50,7 @@
员工
-
+
@@ -67,9 +73,11 @@ import {
cardChangeOutPro,
} from "@/api/eashier.js";
import staffsles from "@/components/staffList/staff/index";
+import staffslesout from "@/components/staffList/staffout/index";
export default {
components: {
staffsles,
+ staffslesout
},
data() {
return {
@@ -95,14 +103,24 @@ export default {
setStaff() {
var that = this;
this.$nextTick(() => {
- console.log(that.$refs.staffsles);
+ // console.log(that.$refs.staffsles);
that.$refs.staffsles.show(that.form.staffLists);
});
},
+ setStaffs() {
+ var that = this;
+ this.$nextTick(() => {
+
+ that.$refs.staffslesout.show(that.form.staffListsout);
+ });
+ },
//员工占比返回方法
staffslesData(v) {
this.form.staffLists = [...v];
},
+ staffslesDataout(v) {
+ this.form.staffListsout = [...v];
+ },
cancel() {
this.$emit("detailData");
this.form = Object.assign({});
@@ -130,7 +148,7 @@ export default {
this.form = {
...item,
};
- this.outList = this.form.coursePayLists;
+ this.outList = this.form.coursePayListRequests;
this.inList = [
{
rechargeTypeId: item.rechargeTypeId,
@@ -141,8 +159,17 @@ export default {
rechargeAfterMoney: item.rechargeAfterMoney,
rechargeAccountId: item.rechargeAccountId,
typeRatio: item.typeRatio,
+ cardConsumeMoney:item.cardConsumeMoney,
+ discount:item.discount
},
];
+ this.form.staffListsout=this.form.coursePayListRequests[0].staffLists
+ this.form.staffListsout.forEach((items) => {
+ items.staffNames = items.brandNumber + "--" + items.staffName;
+ });
+ if (this.form.staffListsout.length == 0) {
+ this.form.staffListsout.push({ ratio: 100 });
+ }
this.form.staffLists = this.form.entities;
this.form.staffLists.forEach((item) => {
item.id = item.saleStaffId;
@@ -153,10 +180,16 @@ export default {
this.form.staffLists.forEach((items) => {
items.staffNames = items.brandNumber + "--" + items.staffName;
});
+ this.form.staffListsout = this.form.coursePayListRequests[0].staffLists;
+ this.form.staffListsout.forEach((items) => {
+ items.staffNames = items.brandNumber + "--" + items.staffName;
+ });
+
if (this.form.staffLists.length == 0) {
this.form.staffLists.push({ ratio: 100 });
}
this.setStaff();
+ this.setStaffs();
},
subStaffRatio() {
editRechargeTurnCourse(this.form).then((res) => {
diff --git a/src/pages/eashier/coursetorec/components/index.vue b/src/pages/eashier/coursetorec/components/index.vue
index 9c2c058..dafe4a6 100644
--- a/src/pages/eashier/coursetorec/components/index.vue
+++ b/src/pages/eashier/coursetorec/components/index.vue
@@ -4,38 +4,120 @@
-
-
+
+
-
-
+
+
- {{proForm.memberName}}
+ {{ proForm.memberName }}
-
+
- {{proForm.additionDate }}
-
+ {{ proForm.additionDate }}
+
+
-
转出疗程
添加
+
+ 转出疗程
+ 添加
- 总金额 : {{outMoneys}}
+ 总金额 : {{ outMoneys }}
-
+
+
+
+
+
+
+
@@ -47,52 +129,232 @@
{{scope.row.rollOffCount}}
-
-
-
-
-
-
-
转入充值
添加
-
撤销
+
+ 转入充值
+ 添加
+ 撤销
-
总金额 : {{inMoneys}}
+
总金额 : {{ inMoneys }}
-
-
-
-
-
-
-
-
-
@@ -102,17 +364,38 @@
-->
- 清空
- 补单
- 加价
- 列表
- 提交
+ 清空
+ 补单
+ 加价
+ 列表
+ 提交
+
+
@@ -121,8 +404,9 @@ import { propage } from "@/api/storeManage.js";
import {
storeMemberOne,
addRechargeTurnCourse,
- recAccountOne,
+ recAccountOne
} from "@/api/eashier.js";
+import staffratio from "./staffratio";
import member from "@/components/member/index";
import Branch from "@/components/Branch/index";
import project from "@/components/project/index";
@@ -138,14 +422,15 @@ export default {
member,
project,
recType,
- Branch
+ Branch,
+ staffratio
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
- },
+ }
},
projectDialogVisible: false,
recDateShow: false,
@@ -155,9 +440,9 @@ export default {
additionDate: null,
manageStaffName: null,
mobilePhone: null,
- Branch:null,
+ Branch: null,
staffLists: [{ ratio: 100 }],
- payLists: [],
+ payLists: []
},
outList: [],
inList: [],
@@ -166,7 +451,7 @@ export default {
total: 0,
pageNum: 1,
pageSize: 10,
- list: [],
+ list: []
},
proRadio: null,
proRadioForm: null,
@@ -177,21 +462,45 @@ export default {
sessionStorageList: null,
isAddition: 0,
loading: false,
+ TransactionNum: 0,
StoreIds:"",
- label:""
+ label:"",
+ staff:[]
};
},
methods: {
+ openStaffRatio(row, index, text) {
+ this.editIndex = index
+ this.$refs.staffratio.show(row);
+ this.$refs.staffratio.showdetele();
+ localStorage.setItem("row", JSON.stringify(row));
+ localStorage.setItem("text", text);
+ },
+ staffratioData(v) {
+ let form = this.outList[this.editIndex];
+ form.rows = v.list;
+ form.staffLists=v.list
+ form.cardAchievementAmount=v.list[0].cardAchievementAmount
+ form.cardCommissionAmount=v.list[0].cardCommissionAmount
+ form.cardSalesAchievement=v.list[0].cardSalesAchievement
+ form.cardSalesCommission=v.list[0].cardSalesCommission
+ console.log("🚀 ~ file: index.vue ~ line 302 ~ staffratioData ~ form", form)
+ this.outList.splice(this.editIndex, 1, form);
+ console.log("🚀 ~ file: index.vue ~ line 235 ~ staffratioData ~ this.outList", this.outList)
+ },
setStaffRatio() {
var that = this;
setTimeout(() => {
- if(this.StoreIds){
- that.$refs.staffsles.show(that.proForm.staffLists,that.StoreIds);
- }else{
+ if (this.StoreIds) {
+ that.$refs.staffsles.show(that.proForm.staffLists, that.StoreIds);
+ } else {
that.$refs.staffsles.show(that.proForm.staffLists);
}
-
- console.log("🚀 ~ file: index.vue ~ line 189 ~ setTimeout ~ that.proForm.staffLists", that.proForm.staffLists)
+
+ console.log(
+ "🚀 ~ file: index.vue ~ line 189 ~ setTimeout ~ that.proForm.staffLists",
+ that.proForm.staffLists
+ );
}, 800);
},
staffslesData(v) {
@@ -200,27 +509,25 @@ export default {
openMember() {
this.$refs.member.show();
},
- openBranch(){
-
+ openBranch() {
this.$refs.Branch.show();
},
memberData(v) {
this.proForm.mobilePhone = v.mobilePhone;
this.memberOne();
-
},
BranchData(v) {
- this.StoreIds=v.id
- this.label=v.label
- this.setStaffRatio();
- console.log("🚀 ~ file: index.vue ~ line 217 ~ BranchData ~ " , 'aaaa')
+ this.StoreIds = v.id;
+ this.label = v.label;
+ this.setStaffRatio();
+ console.log("🚀 ~ file: index.vue ~ line 217 ~ BranchData ~ ", "aaaa");
},
submit() {
this.proForm.rechargeInMoney = this.inMoneys;
this.proForm.courseOutMoney = this.outMoneys;
this.proForm.isAddition = this.isAddition;
- this.proForm.coursePayLists = this.outList;
+ this.proForm.coursePayListRequests = this.outList;
this.proForm.staffLists;
this.proForm = Object.assign(this.proForm, this.inList[0]);
this.inList[0];
@@ -233,7 +540,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
this.loading = false;
}
@@ -243,11 +550,11 @@ export default {
},
addRechargeTurnCourse() {
var that = this;
- addRechargeTurnCourse(this.proForm).then((res) => {
+ addRechargeTurnCourse(this.proForm).then(res => {
this.loading = false;
if (res.code == "000000") {
this.$message.success({
- message: res.message,
+ message: res.message
});
this.empty();
} else {
@@ -256,7 +563,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
}
});
@@ -264,7 +571,7 @@ export default {
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex;
},
- projectData(form) {
+ projectData(form,rows) {
form.memberId = this.proForm.memberId;
form.memberName = this.proForm.memberName;
form.mobilePhone = this.proForm.mobilePhone;
@@ -282,30 +589,43 @@ export default {
form.rollOffMoney = 0;
form.rollOffCountShow = false;
form.accountId = form.id;
+ form.staffLists=rows
+ form.cardAchievementAmount=rows[0].cardAchievementAmount
+ form.cardCommissionAmount=rows[0].cardCommissionAmount
+ form.cardSalesAchievement=rows[0].cardSalesAchievement
+ form.cardSalesCommission=rows[0].cardSalesCommission
let flag = true;
- this.outList.forEach((item) => {
+ form.staffLists=rows
+
+ form.cardAchievementAmount=rows[0].cardAchievementAmount
+ form.cardCommissionAmount=rows[0].cardCommissionAmount
+ form.cardSalesAchievement=rows[0].cardSalesAchievement
+ form.cardSalesCommission=rows[0].cardSalesCommission
+ this.outList.forEach(item => {
if (form.id == item.form.id) {
flag = false;
}
});
+ console.log("🚀 ~ file: index.vue ~ line 343 ~ this.outList.forEach ~ this.outList", this.outList)
if (flag) {
this.outList.push(form);
this.sumMoney();
} else {
this.$message({ message: "项目已存在 !" });
}
+
},
recTypeData(v) {
let form = {
storeId: this.proForm.storeId,
memberId: this.proForm.memberId,
- rechargeTypeId: v.id,
+ rechargeTypeId: v.id
};
v.rechargeTypeId = v.id;
- recAccountOne(form).then((res) => {
+ recAccountOne(form).then(res => {
if (res.data != undefined && res.data.state == 0) {
this.$message.error({
- message: "账户已锁定, 不允许使用 ! ",
+ message: "账户已锁定, 不允许使用 ! "
});
} else {
if (res.code == "000000" || res.code == "200004") {
@@ -330,7 +650,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
}
}
@@ -345,16 +665,19 @@ export default {
// this.empty();
let row = { ...this.proForm };
let form = {
- mobilePhone: mobilePhone,
- storeId: sessionStorage.getItem("parentId"),
- };
+ mobilePhone: mobilePhone,
+ storeId: sessionStorage.getItem("parentId")
+ };
if (mobilePhone) {
- console.log("🚀 ~ file: index.vue ~ line 347 ~ memberOne ~ this.StoreIds", this.StoreIds)
+ console.log(
+ "🚀 ~ file: index.vue ~ line 347 ~ memberOne ~ this.StoreIds",
+ this.StoreIds
+ );
let form = {
mobilePhone: mobilePhone,
- storeId: sessionStorage.getItem("parentId"),
+ storeId: sessionStorage.getItem("parentId")
};
- storeMemberOne(form).then((res) => {
+ storeMemberOne(form).then(res => {
this.proForm.mobilePhone = mobilePhone;
if (res.code == "000000") {
row.memberId = res.data.id;
@@ -372,7 +695,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
}
});
@@ -389,13 +712,12 @@ export default {
this.$refs.recType.show();
}
if (num == 1) {
- if(this.StoreIds){
- this.proForm.storeId=this.StoreIds
-
- }else{
- this.proForm.storeId=""
+ if (this.StoreIds) {
+ this.proForm.storeId = this.StoreIds;
+ } else {
+ this.proForm.storeId = "";
}
- this.$refs.project.show(this.proForm)
+ this.$refs.project.show(this.proForm);
}
},
delOldPro(index) {
@@ -408,13 +730,13 @@ export default {
},
openEdit(row, index) {
let form = {
- ...row,
+ ...row
};
this.inList.splice(index, 1, form);
},
openEditOut(row, index) {
let form = {
- ...row,
+ ...row
};
this.outList.splice(index, 1, form);
},
@@ -429,7 +751,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
row.rollOffCount = row.courseConsumeCount;
} else {
@@ -452,7 +774,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
row.rollOffMoney = money;
} else {
@@ -464,13 +786,13 @@ export default {
sumMoney() {
let inMoneys = 0;
let outMoneys = 0;
- this.inList.forEach((item) => {
+ this.inList.forEach(item => {
item.rechargeInMoney = this.outMoneys;
inMoneys += item.rechargeInMoney * 1;
item.rechargeAfterMoney =
(item.rechargeBeforeMoney + item.rechargeInMoney).toFixed(2) * 1;
});
- this.outList.forEach((item) => {
+ this.outList.forEach(item => {
item.courseAfterUsableCount =
(item.courseBeforeUsableCount - item.rollOffCount).toFixed(0) * 1;
item.courseAfterUsableMoney =
@@ -503,9 +825,9 @@ export default {
state: 1,
directConsumption: 0,
storeIds: JSON.parse(sessionStorage.getItem("storeIdLists")),
- isCooperation: 0,
+ isCooperation: 0
};
- propage(page).then((res) => {
+ propage(page).then(res => {
if (res.code == "000000") {
this.proPageInfo = res.pageInfo;
} else {
@@ -514,7 +836,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
}
});
@@ -526,9 +848,9 @@ export default {
pageSize: this.proPageInfo.pageSize,
state: 1,
directConsumption: 0,
- storeIds: JSON.parse(sessionStorage.getItem("storeIdLists")),
+ storeIds: JSON.parse(sessionStorage.getItem("storeIdLists"))
};
- propage(page).then((res) => {
+ propage(page).then(res => {
if (res.code == "000000") {
this.proPageInfo = res.pageInfo;
} else {
@@ -537,7 +859,7 @@ export default {
confirmButtonClass: "confirmbtnFalses",
type: "warning",
center: true,
- callback: (action) => {},
+ callback: action => {}
});
}
});
@@ -548,11 +870,11 @@ export default {
sessionStorage.getItem("sessionStorageData")
);
this.proForm.additionDate = this.formatTime(new Date(), "YYYY-MM-DD");
- },
+ }
},
created() {
this.setPage();
- },
+ }
};
diff --git a/src/pages/eashier/coursetorec/components/staffratio.vue b/src/pages/eashier/coursetorec/components/staffratio.vue
new file mode 100644
index 0000000..a96869e
--- /dev/null
+++ b/src/pages/eashier/coursetorec/components/staffratio.vue
@@ -0,0 +1,304 @@
+
+
+ 添加
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/eashier/raiseReatment/components/detail.vue b/src/pages/eashier/raiseReatment/components/detail.vue
index f19074c..423890c 100644
--- a/src/pages/eashier/raiseReatment/components/detail.vue
+++ b/src/pages/eashier/raiseReatment/components/detail.vue
@@ -32,6 +32,12 @@
+
+ 员工
+
+
+
+
转入疗程
@@ -58,7 +64,7 @@
员工/门店管理层/高管业绩
-
+
@@ -85,11 +91,14 @@ import {
import admin from "@/components/staffList/admin/index";
import manager from "@/components/staffList/manager/index";
import staffsles from "@/components/staffList/staff/index";
+import staffslesout from "@/components/staffList/staffout/index";
export default {
components: {
staffsles,
+ staffslesout,
manager,
admin,
+ staffslesout
},
data() {
return {
@@ -124,10 +133,20 @@ export default {
that.$refs.manager.show(that.form.managerList);
});
},
+ setStaffs() {
+ var that = this;
+ this.$nextTick(() => {
+ that.$refs.staffslesout.show(that.form.staffListsout);
+ });
+ },
+
//员工占比返回方法
staffslesData(v) {
this.form.staffLists = [...v];
},
+ staffslesDataout(v) {
+ this.form.staffListsout = [...v];
+ },
//高管占比返回方法
managerData(v) {
this.form.managerList = [...v];
@@ -202,6 +221,7 @@ export default {
this.form.managerList = managerList;
this.form.adminList = adminList;
this.setStaff();
+
} else {
this.$alert(res.message, "加载门店高管", {
confirmButtonText: "确定",
@@ -228,7 +248,13 @@ export default {
}).then((res) => {
if (res.code == "000000") {
this.outList = res.rows;
- console.log(this.form);
+ console.log("🚀 ~ file: detail.vue ~ line 241 ~ getData ~ res.rows", res.rows)
+ this.form.staffListsout = res.rows[0].entities;
+
+ this.form.staffListsout.forEach((items) => {
+ items.staffNames = items.brandNumber + "--" + items.saleStaffName;
+ });
+ this.setStaffs();
} else {
this.$alert("加载转出列表 : " + res.message, "提示", {
confirmButtonText: "确定",
diff --git a/src/pages/eashier/service/service.vue b/src/pages/eashier/service/service.vue
index 42ff161..5238fb7 100644
--- a/src/pages/eashier/service/service.vue
+++ b/src/pages/eashier/service/service.vue
@@ -1024,7 +1024,7 @@ export default {
if (form.offsetMoney > debtMoney) {
//判断充值可用金额是否大于成交价如果大于直接用充值可用金额计算
form.discoutMoney =
- (form.spendMoney / form.discount / 100).toFixed(2) * 1;
+ (form.spendMoney / form.discount * 100).toFixed(2) * 1;
} else {
//判断充值可用金额是否大于成交价如果小于选择最大充值金额,剩下的用赠送金额计算
form.spendMoney = form.cardOver;