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 @@ + + + + + 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}}
- - - - -