From 967409550992a3b6e2d70bdc371ef5971d3d9d35 Mon Sep 17 00:00:00 2001 From: Wangxubin Date: Tue, 11 Oct 2022 17:31:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/eashier/accountSet/accountSet.vue | 40 +++++++++++++++++++-- src/pages/eashier/reatment/reatment.vue | 5 +-- src/pages/eashier/repayment/repayment.vue | 2 +- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/pages/eashier/accountSet/accountSet.vue b/src/pages/eashier/accountSet/accountSet.vue index 334f336..88bb153 100644 --- a/src/pages/eashier/accountSet/accountSet.vue +++ b/src/pages/eashier/accountSet/accountSet.vue @@ -62,6 +62,16 @@ + + + @@ -111,6 +121,16 @@ + + + @@ -194,14 +214,23 @@ @@ -290,6 +319,11 @@ export default { }; }, methods: { + // 明细 + abnormalDetailsTest(inp){ + console.log(inp) + this.$set(this.accountList[2],'explainModify',inp) + }, //关闭弹窗前的回调方法 handleClose() { this.accountList = []; @@ -511,6 +545,8 @@ export default { this.accountList[2] ); delete form.id; + console.log(form) + // return if (this.radioAccount == 0) { //cz recAdd(form).then((res) => { diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue index b066133..bfed65e 100644 --- a/src/pages/eashier/reatment/reatment.vue +++ b/src/pages/eashier/reatment/reatment.vue @@ -981,9 +981,9 @@ export default { //修改单价 changesales() { if (this.sessionStorageData.minimum == true) { - console.log(this.form); + this.form.salesPrice = this.form.salesPrice*1 if ( - this.form.salesPric > this.form.topPriceMember || + this.form.salesPrice > this.form.topPriceMember || this.form.salesPrice < this.form.minumumPriceMember ) { this.form.salesPrice = this.form.priceMember; @@ -998,6 +998,7 @@ export default { this.menberShow = false; } } else { + console.log('来到了这里') this.menberShow = false; } this.form.amount = diff --git a/src/pages/eashier/repayment/repayment.vue b/src/pages/eashier/repayment/repayment.vue index f04fd29..18da9c7 100644 --- a/src/pages/eashier/repayment/repayment.vue +++ b/src/pages/eashier/repayment/repayment.vue @@ -7,7 +7,7 @@ - + 搜索 From a62b28701955730f15f87459b8e0de694eaaed9c Mon Sep 17 00:00:00 2001 From: Wangxubin Date: Fri, 14 Oct 2022 09:55:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4--1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 6 +- src/api/statistics.js | 4 +- src/api/storeManage.js | 22 ++- src/components/staffList/admin/index.vue | 2 +- src/components/staffList/manager/index.vue | 2 +- src/components/staffList/staff/index.vue | 10 +- src/components/store/radio/index.vue | 15 ++- src/pages/eashier/reatment/reatment.vue | 2 +- src/pages/eashier/within/components/edit.vue | 1 + .../statistics/negativeCard/negativeCard.vue | 62 +++++++-- src/pages/storeManage/admins/index.vue | 8 +- .../storeParameters/component/store.vue | 126 ++++++++++++++++++ .../storeParameters/storeParameters.vue | 62 ++++++++- .../storeManage/trading/components/cash.vue | 17 ++- 14 files changed, 305 insertions(+), 34 deletions(-) create mode 100644 src/pages/storeManage/storeParameters/component/store.vue diff --git a/config/index.js b/config/index.js index 0cca9a8..eb173e0 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.194", // can be overwritten by process.env.HOST + host: "192.168.31.193", // 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/api/statistics.js b/src/api/statistics.js index 0b67179..7572b8d 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -61,7 +61,7 @@ export function dayStatistic(params) { // 当日负卡金疗程记录查询 export function dayStatisticTreatment(params) { return service({ - url: "/api" + "/demay/ssm/negativeCard/CourseDayStatistic", + url: "/api" + "/demay/ssm/negativeCard/CourseDayStatistics", method: "post", data: params }); @@ -69,7 +69,7 @@ export function dayStatisticTreatment(params) { //当日负卡金充值记录查询 export function dayStatisticRecharge(params) { return service({ - url: "/api" + "/demay/ssm/negativeCard/rechargeDayStatistic", + url: "/api" + "/demay/ssm/negativeCard/rechargeDayStatistics", method: "post", data: params }); diff --git a/src/api/storeManage.js b/src/api/storeManage.js index ec08dd8..a306c32 100644 --- a/src/api/storeManage.js +++ b/src/api/storeManage.js @@ -5,6 +5,24 @@ import { localPath } from "./api.js"; +// 获取某门店参数 +export function allStores(data){ + return service({ + url: "/api" + '/demay/ssm/storePara/list', + method: "post", + data + }) +} + +// 同步总店数据 +export function totalData(params){ + return service({ + url: "/api" + '/demay/ssm/storePara/update1', + method: 'post', + params: params + }) +} + // 添加门店参数 export function addstorePara(params) { return service({ @@ -27,7 +45,9 @@ export function storeParaList(params) { method: "post", data: params }); -} // 修改门店参数 +} + +// 修改门店参数 export function editstorePara(params) { return service({ url: "/api" + "/demay/ssm/storePara/update", diff --git a/src/components/staffList/admin/index.vue b/src/components/staffList/admin/index.vue index 1cd86d1..d0d0370 100644 --- a/src/components/staffList/admin/index.vue +++ b/src/components/staffList/admin/index.vue @@ -248,7 +248,7 @@ export default { // arr.push(item); // } // }); - this.staffList = this.noRepeat(arr); + if(arr.length)this.staffList = this.noRepeat(arr); }, //获取员工数据 //获取数据 diff --git a/src/components/staffList/manager/index.vue b/src/components/staffList/manager/index.vue index 79c56d5..561c381 100644 --- a/src/components/staffList/manager/index.vue +++ b/src/components/staffList/manager/index.vue @@ -246,7 +246,7 @@ export default { // arr.push(item); // } // }); - this.staffList = this.noRepeat(arr); + if(arr.length)this.staffList = this.noRepeat(arr); }, //获取高管数据 //获取数据 diff --git a/src/components/staffList/staff/index.vue b/src/components/staffList/staff/index.vue index 6087819..e9572b2 100644 --- a/src/components/staffList/staff/index.vue +++ b/src/components/staffList/staff/index.vue @@ -127,7 +127,6 @@ export default { this.staffLists.forEach((item, index) => { if (index != 0) { number += item.ratio * 1; - console.l } this.staffLists[0].ratio = 100 - number }); @@ -146,7 +145,6 @@ export default { this.staffLists.forEach((item, index) => { if (index != 0) { number += item.ratio * 1; - console.l } this.staffLists[0].ratio = 100 - number }); @@ -200,7 +198,7 @@ export default { show(list, storeId) { this.staffLists = [...list]; this.staffLists.forEach((item) => { - if (item.id || item.staffId) { + if (item.id || item.staffId) { item.staffNames = item.brandNumber + "-" + item.staffName; } else { item.staffNames = ""; @@ -230,7 +228,6 @@ export default { }); this.$emit("staffslesData", list); - console.log("🚀 ~ file: index.vue ~ line 222 ~ confirm ~ list", list) }, //改变员工 去除未选择员工列表中的员工 changeStaff() { @@ -240,7 +237,7 @@ export default { let list = []; this.staffListCopy.forEach((items) => { if (item.id != items.id) { - list.push(items); + arr.push(items); } }); arr = list; @@ -258,8 +255,7 @@ export default { // arr.push(item); // } // }); - - this.staffList = this.noRepeat(arr); + if(arr.length){this.staffList = this.noRepeat(arr);} }, //获取员工数据 //获取数据 diff --git a/src/components/store/radio/index.vue b/src/components/store/radio/index.vue index 49192b6..484ff23 100644 --- a/src/components/store/radio/index.vue +++ b/src/components/store/radio/index.vue @@ -22,6 +22,13 @@ \ No newline at end of file diff --git a/src/pages/storeManage/storeParameters/storeParameters.vue b/src/pages/storeManage/storeParameters/storeParameters.vue index beee733..13e1ec4 100644 --- a/src/pages/storeManage/storeParameters/storeParameters.vue +++ b/src/pages/storeManage/storeParameters/storeParameters.vue @@ -5,8 +5,9 @@
同步总店参数 修改 - 取消 + 取消 保存 + 设置分店参数
@@ -324,19 +325,26 @@ - +