diff --git a/docs/databases/table_create_customer-cashed.sql b/docs/databases/table_create_customer-cashed.sql index 769adc2d..90758e52 100644 --- a/docs/databases/table_create_customer-cashed.sql +++ b/docs/databases/table_create_customer-cashed.sql @@ -147,7 +147,9 @@ CREATE TABLE `csm_cash_report` ( `tillTime` varchar(100) DEFAULT NULL COMMENT '截止时间', `accountBalance` double(12,2) DEFAULT 0 COMMENT '账户余额', `auditResult` varchar(1024) DEFAULT NULL COMMENT '审核结果', - `reportDate` varchar(100) DEFAULT NULL COMMENT '日期(yyyy年MM月dd日)', + `reportDate` varchar(100) DEFAULT NULL COMMENT '日期(yyyy年MM月dd日)', + `fileFullPath` varchar(255) DEFAULT NULL COMMENT '文件完整路径', + `fileUrl` varchar(1024) DEFAULT NULL COMMENT '文件下载地址', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB COMMENT='每日回款审核报告' ; diff --git a/docs/databases/table_create_report-inventory.sql b/docs/databases/table_create_report-inventory.sql index 2fa68038..2e0d6270 100644 --- a/docs/databases/table_create_report-inventory.sql +++ b/docs/databases/table_create_report-inventory.sql @@ -36,6 +36,7 @@ CREATE TABLE `report_inventory_day_store` ( `storeCode` VARCHAR(100) DEFAULT NULL COMMENT '门店编号', `storeCodeName` VARCHAR(100) DEFAULT NULL COMMENT '[门店编号]门店名称', `productCountNumber` int(11) DEFAULT 0 COMMENT '商品数量', + `typeNumber` int(0) NULL DEFAULT NULL COMMENT '商品品种数量', `productAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货值', `countAmount` double(12,2) DEFAULT NULL COMMENT '合计货值', `countProductNumber` bigint(11) DEFAULT 0 COMMENT '合计品种数量', @@ -58,6 +59,7 @@ CREATE TABLE `report_inventory_day_tobacco_store` ( `storeCode` VARCHAR(100) DEFAULT NULL COMMENT '门店编号', `storeCodeName` VARCHAR(100) DEFAULT NULL COMMENT '[门店编号]门店名称', `productCountNumber` int(11) DEFAULT 0 COMMENT '品种数量', + `typeNumber` int(0) NULL DEFAULT NULL COMMENT '商品品种数量', `productAmount` DOUBLE(12,2) DEFAULT 0 COMMENT '货值', `countAmount` double(12,2) DEFAULT NULL COMMENT '合计货值', `countProductNumber` bigint(11) DEFAULT 0 COMMENT '合计品种数量', diff --git a/docs/kaifa/cryptoDemo.zip b/docs/kaifa/cryptoDemo.zip new file mode 100644 index 00000000..f2f035a4 Binary files /dev/null and b/docs/kaifa/cryptoDemo.zip differ diff --git a/supervise-customer-ui/src/api/customer/csmcash.js b/supervise-customer-ui/src/api/customer/csmcash.js index 47d38788..edec3f6f 100644 --- a/supervise-customer-ui/src/api/customer/csmcash.js +++ b/supervise-customer-ui/src/api/customer/csmcash.js @@ -11,10 +11,32 @@ export default { data: params }) }, - // 通过sid查询一条记录 - fetchBySid: function(sid) { + // 根据SID获取一条日志记录 + fetchLogBySid: function(sid) { return request({ - url: '/supervise/v1/gdinstoragelog/fetchDetailsBySid/' + sid + baseURL: '/api', + url: '/customer/csmcash/fetchLogBySid/' + sid + }) + }, + // 根据日志SID获取销售列表 + listSalesByLogsid: function(sid) { + return request({ + baseURL: '/api', + url: '/customer/csmcash/listSalesByLogsid/' + sid + }) + }, + // 根据日志SID获取回款列表 + listIncomeByLogsid: function(sid) { + return request({ + baseURL: '/api', + url: '/customer/csmcash/listIncomeByLogsid/' + sid + }) + }, + // 根据日志SID获取比对列表 + listDifferentByLogsid: function(sid) { + return request({ + baseURL: '/api', + url: '/customer/csmcash/listDifferentByLogsid/' + sid }) }, // 通过sid清除临时数据 diff --git a/supervise-customer-ui/src/layout/components/AppMain.vue b/supervise-customer-ui/src/layout/components/AppMain.vue index e54465dc..59ae1736 100644 --- a/supervise-customer-ui/src/layout/components/AppMain.vue +++ b/supervise-customer-ui/src/layout/components/AppMain.vue @@ -1,268 +1,69 @@ diff --git a/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue b/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue index 09b40af4..0e0246e3 100644 --- a/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue +++ b/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue @@ -1,5 +1,5 @@ - diff --git a/supervise-customer-ui/src/views/daydataupload/cash/index.vue b/supervise-customer-ui/src/views/daydataupload/cash/index.vue index cd5e9995..7968d818 100644 --- a/supervise-customer-ui/src/views/daydataupload/cash/index.vue +++ b/supervise-customer-ui/src/views/daydataupload/cash/index.vue @@ -67,7 +67,7 @@ - + @@ -306,7 +306,7 @@ }, toEdit(row) { this.viewState = 3 - // this.$refs['divadd'].showEdit(row) + this.$refs['divcashedit'].showEdit(row) }, resetState() { this.viewState = 1 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-risk-ui/src/views/risk/RiskManage/RiskAdd.vue b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue index c0786088..7a88aa28 100644 --- a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue +++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue @@ -104,7 +104,7 @@ export default { typeSid:'', remarks:'', reportTarget:'', - list:[] + // list:[] }, rules: { name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }], @@ -175,7 +175,7 @@ export default { _this.formobj.typeCode = vdata.typeCode _this.formobj.reportTarget = vdata.reportTarget _this.formobj.remarks = vdata.remarks - _this.selectedOptions= vdata.list + // _this.selectedOptions= vdata.list }, getParentsById(list, id) { for (let i in list) { 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 @@