diff --git a/src/api/login.js b/src/api/login.js index 4b13f23..1cd5ae8 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -10,6 +10,23 @@ export function getSmsCode(params) { }); } +// 查询所有归属公司 +export function selectDescription() { + return service({ + url: "/api" + "/demay/ssm/store/selectDescription", + method: "post", + }); +} + +// 修改门店参数 +export function updataStore(data) { + return service({ + url: "/api" + "/demay/ssm/store/updateStore", + method: "post", + data + }); +} + // 门店员工手机验证码登陆获取token接口 export function phoneLogin(params) { return service({ diff --git a/src/api/statistics.js b/src/api/statistics.js index 92d122e..23aa7d9 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -37,7 +37,8 @@ export function exportStoreByDayDailys(params){ export function exportStoreDailys(params) { return service({ - url: "/api" + "/demay/ssm/storeExport/storeDailys", + // url: "/api" + "/demay/ssm/storeExport/storeDailys", + url: "/api" + "/demay/ssm/storeExport/storeDailysNew", method: "post", data: params }); @@ -256,7 +257,7 @@ export function achiCommListsgroup(params) { //导出 export function exportachi(params) { return service({ - url: "/api" + "/demay/ssm/staff////////achiCommListsgroup/exportachi", + url: "/api" + "/demay/ssm/staff/achiCommListsgroup/exportachi", method: "post", data: params, responseType: "blob" diff --git a/src/api/storeManage.js b/src/api/storeManage.js index 52aa556..fcdbc70 100644 --- a/src/api/storeManage.js +++ b/src/api/storeManage.js @@ -35,11 +35,12 @@ export function DynamicLoginNews(data){ } // 同步总店数据 -export function totalData(params){ +export function totalData(params,data){ return service({ url: "/api" + '/demay/ssm/storePara/update1', method: 'post', - params: params + params, + data }) } @@ -1131,6 +1132,17 @@ export function departmentPerformance(params) { data: params }); } + +// 导出部门业绩 +export function exportachi(params) { + return service({ + url: "/api" + "/demay/ssm/staff/departmentPerformance/exportachi", + method: "post", + data: params, + responseType: "blob", + }); +} + //明细 export function departmentPerformance2(params) { return service({ diff --git a/src/components/member/edit/index.vue b/src/components/member/edit/index.vue index 9636df2..6bedf41 100644 --- a/src/components/member/edit/index.vue +++ b/src/components/member/edit/index.vue @@ -148,7 +148,7 @@ export default { confirm() { this.$refs.form.validate(async (valid) => { if (valid) { - if (partten.phoneNum.test(this.form.mobilePhone)) { + // if (partten.phoneNum.test(this.form.mobilePhone)) { if (this.title == "添加") { if (this.form.checkPass == this.form.cashPassword) { this.form.storeId = sessionStorage.getItem("parentId"); @@ -190,15 +190,15 @@ export default { } }); } - } else { - this.$alert("请输入正确的11位手机号", "提示", { - confirmButtonText: "确定", - confirmButtonClass: "confirmbtnFalses", - type: "warning", - center: true, - callback: (action) => {}, - }); - } + // } else { + // this.$alert("请输入正确的11位手机号", "提示", { + // confirmButtonText: "确定", + // confirmButtonClass: "confirmbtnFalses", + // type: "warning", + // center: true, + // callback: (action) => {}, + // }); + // } } }); }, diff --git a/src/components/repayment/index.vue b/src/components/repayment/index.vue index a387f6b..afe1ec3 100644 --- a/src/components/repayment/index.vue +++ b/src/components/repayment/index.vue @@ -540,7 +540,7 @@ export default { } }); element.staffList = element.entities; - selectOne({ type: 7, orderId: element.id }).then((res) => { + selectOne({ type: 7, orderId: element.docId }).then((res) => { if (res.code == "000000") { var managerList = []; var adminList = []; @@ -727,8 +727,17 @@ export default { delete item.docDate; delete item.yetMoney; }); - this.form.debtMoney = debtMoney; - if (this.debtMoneys != 0) { + // this.form.debtMoney = debtMoney; + let sumTotal = eval(this.multipleSelection.map(item=>item.paymentMoney?item.paymentMoney*1:0).join("+")) //待付总额 + let paySum = eval(this.payLists.map(item=>item.payMoney?item.payMoney*1:0).join("+")) //支付总额 + + // if (this.debtMoneys != 0) { + // this.$message.error({ + // message: "还款金额与支付金额不一致", + // }); + // this.loading = false; + // } + if (sumTotal != paySum) { this.$message.error({ message: "还款金额与支付金额不一致", }); diff --git a/src/components/store/select/index.vue b/src/components/store/select/index.vue index f82d4b5..dda50b7 100644 --- a/src/components/store/select/index.vue +++ b/src/components/store/select/index.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/src/pages/storeManage/storeParameters/component/store.vue b/src/pages/storeManage/storeParameters/component/store.vue index 9bb7417..1c1e85a 100644 --- a/src/pages/storeManage/storeParameters/component/store.vue +++ b/src/pages/storeManage/storeParameters/component/store.vue @@ -51,7 +51,6 @@ export default { // }); // }else{ let store = this.options[this.options.findIndex(item=>item.id === this.storeId)] - console.log(store) this.$emit('getData',null,this.storeId,true) this.$emit('updataStore',store.storeNum + '-' + store.storeName) sessionStorage.setItem('formData',JSON.stringify(this.form)) diff --git a/src/pages/storeManage/storeParameters/storeParameters.vue b/src/pages/storeManage/storeParameters/storeParameters.vue index 8772c8d..9d266be 100644 --- a/src/pages/storeManage/storeParameters/storeParameters.vue +++ b/src/pages/storeManage/storeParameters/storeParameters.vue @@ -351,12 +351,14 @@ - + +