diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 3a8e9ae..37986f0 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -46,6 +46,10 @@ module.exports = { }, module: { rules: [ + { + test: /\.scss$/, + loaders: ['style', 'css', 'sass'] + }, ...(config.dev.useEslint ? [createLintingRule()] : []), { test: /\.vue$/, diff --git a/package-lock.json b/package-lock.json index a420553..8a30c33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8260,9 +8260,9 @@ } }, "klona": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "dev": true }, "last-call-webpack-plugin": { @@ -14282,12 +14282,12 @@ } }, "sass-loader": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz", - "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.2.tgz", + "integrity": "sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==", "dev": true, "requires": { - "klona": "^2.0.4", + "klona": "^2.0.6", "neo-async": "^2.6.2" }, "dependencies": { @@ -15207,6 +15207,11 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, + "style-loader": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.2.tgz", + "integrity": "sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw==" + }, "stylehacks": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", diff --git a/package.json b/package.json index 7c43aa5..64a44c7 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "qs": "^6.9.4", "serve": "^11.3.2", "sortablejs": "^1.10.2", + "style-loader": "^3.3.2", "v-fit-columns": "^0.2.0", "vue": "^2.5.2", "vue-axios": "^2.1.5", @@ -91,7 +92,7 @@ "postcss-url": "^7.2.1", "px2rem-loader": "^0.1.9", "rimraf": "^2.6.0", - "sass-loader": "^13.0.2", + "sass-loader": "^13.2.2", "selenium-server": "^3.0.1", "semver": "^5.3.0", "shelljs": "^0.8.5", diff --git a/src/api/statistics.js b/src/api/statistics.js index a7d8018..92d122e 100644 --- a/src/api/statistics.js +++ b/src/api/statistics.js @@ -26,6 +26,15 @@ export function storeByDayDailys(params){ }) } +export function exportStoreByDayDailys(params){ + return service({ + url: "/api" + '/demay/ssm/storeStatistic/storeByDayDailys/export', + method: 'post', + data: params, + responseType:"blob" + }) +} + export function exportStoreDailys(params) { return service({ url: "/api" + "/demay/ssm/storeExport/storeDailys", diff --git a/src/api/storeManage.js b/src/api/storeManage.js index 1dedf30..52aa556 100644 --- a/src/api/storeManage.js +++ b/src/api/storeManage.js @@ -935,7 +935,7 @@ export function salesmanMxs(params) { // 查询高管业绩明细导出 export function salesmanExportachi(params) { return service({ - url: "/api" + "/demay/ssm/salesman/exportachi", + url: "/api" + "/demay/ssm/salesman/selectLists/export", method: "post", responseType: "blob", data: params diff --git a/src/components/BMap/BMap.vue b/src/components/BMap/BMap.vue index 9d911b1..0c04087 100644 --- a/src/components/BMap/BMap.vue +++ b/src/components/BMap/BMap.vue @@ -97,19 +97,17 @@ export default { }); }, // 浏览器定位函数 + // 第二次回来的时候 geolocation() { var that = this; var geolocation = new BMap.Geolocation(); - //console.log(geolocation); geolocation.getCurrentPosition( function (res) { - //console.log(res.point); if (res != undefined || res != null) { that.getAddrByPoint(res.point); } else { res.point.lat = 39.915095185635316 res.point.lng = 116.40397079994426 - that.getAddrByPoint(res.point); var point = new BMap.Point(39.915095185635316, 116.40397079994426); } }, diff --git a/src/components/order/detail.vue b/src/components/order/detail.vue index ce8f264..5297bb2 100644 --- a/src/components/order/detail.vue +++ b/src/components/order/detail.vue @@ -2,7 +2,7 @@
- + @@ -121,6 +121,7 @@ export default { docTypeName: "促销还款", }, ], + project:{}, queryForm: { //查询对象 pageNum: 1, @@ -131,8 +132,7 @@ export default { methods: { //组件传值 show(form, number) { - console.log(form); - console.log(number); + if(form.project)this.project = form.project // number 1 异常单进入 this.querForm = { pageNum: 1, pageSize: 10 }; if (number == 1) { @@ -142,7 +142,8 @@ export default { this.queryForm.storeId = form.storeId; } var item = {}; - // type // 0 充值 + // type + // 0 充值 // 1 疗程 // 2 收银 // 3 还款 @@ -163,7 +164,6 @@ export default { } else { this.queryForm.selectDate = form.docDate ? form.docDate : form.date; } - console.log(this.queryForm); recDetail(this.queryForm).then((res) => { if (res.code == "000000") { if (res.pageInfo.total == 0) { diff --git a/src/components/project/index.vue b/src/components/project/index.vue index 0ac9f3c..71098b7 100644 --- a/src/components/project/index.vue +++ b/src/components/project/index.vue @@ -181,6 +181,7 @@ export default { } else { this.title = "选择门店项目"; if(this.storeId)this.queryForm.storeId = this.storeId + console.log(this.queryForm,'<---') propageNew(this.queryForm).then((res) => { this.listLoading = false; if (res.code == "000000") { diff --git a/src/layout/components/Emain.vue b/src/layout/components/Emain.vue index cbfd54d..a9b862b 100644 --- a/src/layout/components/Emain.vue +++ b/src/layout/components/Emain.vue @@ -36,7 +36,7 @@ export default { data() { return { - keepList:['services','collectionList'], //reatment + keepList:['services','collectionList','reatment','storeDaily','dept','staffBrokerage'], //reatment cancelList:['首页','充值','疗程','直接收银'], tagsList: [ { path: "/home", title: "首页" }, diff --git a/src/login/components/superPassword.vue b/src/login/components/superPassword.vue index 403b6f7..a74a863 100644 --- a/src/login/components/superPassword.vue +++ b/src/login/components/superPassword.vue @@ -3,12 +3,13 @@ :title="title" :visible.sync="dialogVisible" width="30%" + :close-on-click-modal="false" :before-close="handleClose">
- + - + {{codeBtnWord}} diff --git a/src/pages/branch/subbranch/component/index.vue b/src/pages/branch/subbranch/component/index.vue new file mode 100644 index 0000000..0204bb1 --- /dev/null +++ b/src/pages/branch/subbranch/component/index.vue @@ -0,0 +1,78 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/branch/subbranch/index.vue b/src/pages/branch/subbranch/index.vue index bcaffa5..e32368f 100644 --- a/src/pages/branch/subbranch/index.vue +++ b/src/pages/branch/subbranch/index.vue @@ -1,17 +1,25 @@ + \ No newline at end of file diff --git a/src/pages/eashier/errorOrder/index.vue b/src/pages/eashier/errorOrder/index.vue index 2354290..78469b3 100644 --- a/src/pages/eashier/errorOrder/index.vue +++ b/src/pages/eashier/errorOrder/index.vue @@ -34,10 +34,8 @@ - - @@ -45,7 +43,6 @@ -
@@ -103,8 +100,6 @@ export default { methods: { //列表数组双击方法 rowdbClick(row) { - console.log(row); - console.log(this.$refs.orderdetail); this.$refs.orderdetail.show(row, 1); }, handleSizeChange(val) { diff --git a/src/pages/eashier/proceeds/detail/editform.vue b/src/pages/eashier/proceeds/detail/editform.vue index 7966039..06df3ad 100644 --- a/src/pages/eashier/proceeds/detail/editform.vue +++ b/src/pages/eashier/proceeds/detail/editform.vue @@ -128,7 +128,11 @@ - + + +
@@ -147,6 +151,7 @@ 取消 {{title=='作废'?title:"确定"}}
+ diff --git a/src/pages/statistics/storeDaily/form.vue b/src/pages/statistics/storeDaily/form.vue index d311db5..8e7cc02 100644 --- a/src/pages/statistics/storeDaily/form.vue +++ b/src/pages/statistics/storeDaily/form.vue @@ -2,7 +2,8 @@
- + @@ -46,54 +47,29 @@ - - - - - - - - - - - - +
--> +
+ + + + + + + + +
@@ -167,7 +143,7 @@ export default { } - diff --git a/src/pages/storeManage/dept/index.vue b/src/pages/storeManage/dept/index.vue index 1f1f500..58d17f3 100644 --- a/src/pages/storeManage/dept/index.vue +++ b/src/pages/storeManage/dept/index.vue @@ -2,8 +2,9 @@
选择日期 - + + 查询
@@ -81,6 +82,7 @@ import detail from "./components/index"; export default { components: { detail }, + name:"dept", data() { return { pickerOptions: { diff --git a/src/pages/storeManage/managers/index.vue b/src/pages/storeManage/managers/index.vue index e10a1f7..548229a 100644 --- a/src/pages/storeManage/managers/index.vue +++ b/src/pages/storeManage/managers/index.vue @@ -18,18 +18,24 @@ -
+
{{queryForm.staffName}}
+ + + + 查询 + 导出 + -
+
@@ -38,7 +44,22 @@ - + + + + + + + + + +
@@ -148,31 +169,35 @@ export default { detailData() {}, //选中门店返回方法 storeData(v) { - console.log(v); - this.queryForm.storeId = v.id; - this.queryForm.storeNum = v.storeNum; - this.queryForm.storeName = v.storeName; - this.getData(); + // console.log(v); + // this.queryForm.storeId = v.id; + // this.queryForm.storeNum = v.storeNum; + // this.queryForm.storeName = v.storeName; + this.$set(this.queryForm,'storeId',v.id) + this.$set(this.queryForm,'storeNum',v.storeNum) + this.$set(this.queryForm,'storeName',v.storeName) + + // this.getData(); }, //高管占比返回方法 managerData(v) { - console.log(v); - this.queryForm.staffName = v.staffName; - this.queryForm.brandNumber = v.brandNumber; - this.getData(); + // this.queryForm.staffName = v.staffName; + // this.queryForm.brandNumber = v.brandNumber; + this.$set(this.queryForm,'staffName',v.staffName) + this.$set(this.queryForm,'brandNumber',v.brandNumber) + // this.getData(); }, //选中员工返回方法 staffData(v) { this.queryForm.staffName = v.staffName; this.queryForm.brandNumber = v.brandNumber; - this.getData(); + // this.getData(); }, //时间组件时间改变方法 - changeMonth(res) { - console.log(res); - let date = this.formatTime(res[1], "YYYY-MM-DD 23:59:59"); - this.days = [res[0], date]; - this.queryForm.startDate = res[0]; + changeMonth() { + let date = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59"); + this.days = [this.days[0], date]; + this.queryForm.startDate = this.days[0]; this.queryForm.endDate = date; this.getData(); }, diff --git a/src/pages/storeManage/memberList/memberList.vue b/src/pages/storeManage/memberList/memberList.vue index 109916e..1c37342 100644 --- a/src/pages/storeManage/memberList/memberList.vue +++ b/src/pages/storeManage/memberList/memberList.vue @@ -882,6 +882,7 @@ export default { this.$message.success({ message: "已刷新最新数据" }); this.refreshtext = false; } + console.log( res.pageInfo ) var headOffice = sessionStorage.getItem("headOffice"); var storeName = sessionStorage.getItem("storeName"); var storeId = sessionStorage.getItem("storeId"); @@ -1134,6 +1135,7 @@ export default { } }) } + console.log( this.pageInfo ) return this.pageInfo.tableList; } } diff --git a/src/router/index.js b/src/router/index.js index 6328bef..e3256f0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -504,7 +504,7 @@ const router = new VueRouter({ //业绩重算 recountOrder { path: "/recountOrder", - component: () => import("../pages/eashier/recount/index.vue"), + component: () => import("../pages/eashier/recount/cIndex.vue"), meta: { title: "业绩重算", index: "recountOrder"