diff --git a/supervise-report-ui/.env.development b/supervise-report-ui/.env.development index 7f387f4d..5afdb45e 100644 --- a/supervise-report-ui/.env.development +++ b/supervise-report-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api/service' ## 配置测试和本地开发时的 接口地址 -##VUE_APP_URL = "http://8.130.39.13:8112" -VUE_APP_URL = "http://192.168.1.193:8112" +VUE_APP_URL = "http://8.130.39.13:8112" +##VUE_APP_URL = "http://192.168.1.193:8112" diff --git a/supervise-report-ui/src/views/reportCenter/inventorySummary.vue b/supervise-report-ui/src/views/reportCenter/inventorySummary.vue index 8e5b581b..ac5f7650 100644 --- a/supervise-report-ui/src/views/reportCenter/inventorySummary.vue +++ b/supervise-report-ui/src/views/reportCenter/inventorySummary.vue @@ -7,9 +7,10 @@ {{ searchxianshitit }}
- + - +
@@ -146,7 +147,10 @@ }, logList3: [], // orderDate: "2023-06-26" - orderDate: parseTime(new Date(), '{y}-{m}-{d}') + page: { + orderDate: parseTime(new Date(), '{y}-{m}-{d}') + } + } }, mounted() { @@ -178,7 +182,7 @@ }, resetQuery() { - this.orderDate = "" + this.page.orderDate = "" }, // 右上角点击事件 @@ -225,7 +229,7 @@ }, loadLogList1() { - getReportInventoryDayGather(this.orderDate).then(response => { + getReportInventoryDayGather(this.page.orderDate).then(response => { if (response.code === '200' && response.data) { this.logList = response.data.list this.logInfo = { @@ -243,7 +247,7 @@ return index + 1 }, loadLogList2() { - getReportInventoryDayStore(this.orderDate).then(response => { + getReportInventoryDayStore(this.page.orderDate).then(response => { if (response.code === '200' && response.data) { this.logList2 = response.data.list this.logInfo2 = { @@ -260,7 +264,7 @@ return index + 1 }, loadLogList3() { - getReportInventoryDayToStore(this.orderDate).then(response => { + getReportInventoryDayToStore(this.page.orderDate).then(response => { if (response.code === '200' && response.data) { this.logList3 = response.data.list this.logInfo3 = { @@ -278,8 +282,8 @@ }, // 导出文件 doBuild() { - exportExcel(this.orderDate).then((resp) => { - console.log(">>>>>11111111111111111", resp) + exportExcel(this.page.orderDate).then((resp) => { + console.log(">>>>>11111111111111111", resp) // console.log(">>>>>222222222", process.env.VUE_APP_BASE_API + resp.data.fullUrl) window.location.href = resp.data }).catch(() => { diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json index 3c252963..483450cc 100644 --- a/supervise-uniapp/pages.json +++ b/supervise-uniapp/pages.json @@ -16,9 +16,6 @@ } }, { - "path": "pages/home/AddFragment", - "style": {} - },{ "path": "pages/home/FindFragment", "style": {} }, { @@ -58,7 +55,7 @@ "pagePath": "pages/home/FindFragment", "iconPath": "static/bottom-icon/find_normal.png", "selectedIconPath": "static/bottom-icon/find_press.png", - "text": "业务" + "text": "工作台" }, { "pagePath": "pages/home/AddFragment", "iconPath": "static/bottom-icon/add_normal.png", diff --git a/supervise-uniapp/pages/login/login.vue b/supervise-uniapp/pages/login/login.vue index a17096de..4277fee7 100644 --- a/supervise-uniapp/pages/login/login.vue +++ b/supervise-uniapp/pages/login/login.vue @@ -33,8 +33,8 @@ vavatar: '/static/uview/common/logo.png', // 表单数据 formData: { - userName: '', - password: '' + userName: 'admin', + password: '111111' }, rules: { // 对name字段进行必填验证 @@ -71,7 +71,7 @@ // url: '/pages/index/index', // }) uni.switchTab({ - url: '/pages/home/AddFragment' + url: '../home/AddFragment' }); }) diff --git a/supervise-wx-mp/App.vue b/supervise-wx-mp/App.vue index 1090e56c..e7fa51ba 100644 --- a/supervise-wx-mp/App.vue +++ b/supervise-wx-mp/App.vue @@ -12,6 +12,18 @@ // url: 'pages/index/enterpriseRisk' // }); // }, 1500); + if (!wx.cloud) { + console.error('请使用 2.2.3 或以上的基础库以使用云能力') + } else { + wx.cloud.init({ + // env 参数说明: + // env 参数决定接下来小程序发起的云开发调用 (wx.cloud.xxx) 会默认请求到哪个云环境的资源 + // 此处请填入环境 ID，环境 ID 可打开云控制台查看 + //如不填则使用默认环境 (第一个创建的环境) + // env: 'my-env-id + traceUser: true, + }) + } }, onShow: function() { console.log('App Show') diff --git a/supervise-wx-mp/common/request.api.js b/supervise-wx-mp/common/request.api.js index 2f5f1aa1..34306d43 100644 --- a/supervise-wx-mp/common/request.api.js +++ b/supervise-wx-mp/common/request.api.js @@ -22,7 +22,7 @@ export default { params), // 库存汇总表 - getReportInventoryDayGather: (params = {}) => request.get("/reportwxmpapi/reportinventory//getReportInventoryDayGather/" + + getReportInventoryDayGather: (params = {}) => request.get("/reportwxmpapi/reportinventory/getReportInventoryDayGather/" + params, params), // 仓库库存明细表 diff --git a/supervise-wx-mp/pages.json b/supervise-wx-mp/pages.json index 9ce06676..f5f2cf8b 100644 --- a/supervise-wx-mp/pages.json +++ b/supervise-wx-mp/pages.json @@ -1,6 +1,11 @@ { "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { + "path": "pages/index/auditReport", + "style": { + "navigationBarTitleText": "回款报告" + } + },{ "path": "pages/index/inventoryReport", "style": { "navigationBarTitleText": "库存日报表" @@ -10,11 +15,6 @@ "style": { "navigationBarTitleText": "登录" } - },{ - "path": "pages/index/auditReport", - "style": { - "navigationBarTitleText": "回款报告" - } },{ "path": "pages/index/enterpriseRisk", "style": { diff --git a/supervise-wx-mp/pages/index/auditReport.vue b/supervise-wx-mp/pages/index/auditReport.vue index 186d2feb..6acf7448 100644 --- a/supervise-wx-mp/pages/index/auditReport.vue +++ b/supervise-wx-mp/pages/index/auditReport.vue @@ -1,8 +1,20 @@