diff --git a/docs/databases/table_create_customer-cashed.sql b/docs/databases/table_create_customer-cashed.sql index 1a1e5483..c2acbec5 100644 --- a/docs/databases/table_create_customer-cashed.sql +++ b/docs/databases/table_create_customer-cashed.sql @@ -54,8 +54,8 @@ CREATE TABLE `csm_cash_sales` ( `disbursementChannelSid` VARCHAR(100) DEFAULT NULL COMMENT '支付渠道Sid', `disbursementChannelName` VARCHAR(100) DEFAULT NULL COMMENT '支付渠道名称', `amount` double(12,2) DEFAULT 0 COMMENT '金额(元)', - `CompanySid` VARCHAR(100) DEFAULT NULL COMMENT '对应公司主体Sid', - `CompanyName` VARCHAR(100) DEFAULT NULL COMMENT '对应公司主体名称', + `companySid` VARCHAR(100) DEFAULT NULL COMMENT '对应公司主体Sid', + `companyName` VARCHAR(100) DEFAULT NULL COMMENT '对应公司主体名称', `accountCycle` VARCHAR(100) DEFAULT '-' COMMENT '到账周期', `accountCycleDays` INT(11) NOT NULL DEFAULT '0' COMMENT '到账周期天数', diff --git a/docs/云梦瀚川货物明细字段与接口对应关系.xlsx b/docs/云梦瀚川货物明细字段与接口对应关系.xlsx new file mode 100644 index 00000000..ed864739 Binary files /dev/null and b/docs/云梦瀚川货物明细字段与接口对应关系.xlsx differ diff --git a/docs/证书/10734649_supervise.yxtsoft.com_nginx.zip b/docs/证书/10734649_supervise.yxtsoft.com_nginx.zip new file mode 100644 index 00000000..7270733f Binary files /dev/null and b/docs/证书/10734649_supervise.yxtsoft.com_nginx.zip differ diff --git a/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue b/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue index 8c445978..f85756c2 100644 --- a/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue +++ b/supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue @@ -29,22 +29,15 @@ - + - - - + + + - - - @@ -62,7 +55,7 @@ - + @@ -84,23 +77,26 @@
回款分析
合计数量: - 合计金额: + 合计金额: + + 回款分析 + 新增分析记录 + 保存回款分析 +
- - - - - - - - - - - - + + + + + + + + + + @@ -115,7 +111,7 @@ 回款日期 - + {{ incomeObj.dataDate }} @@ -247,11 +243,6 @@ }, incomeCurrent: null, rules: { - dataDate: [{ - required: true, - message: '请选择回款日期', - trigger: 'blur' - }], collectionChannelSid: [{ required: true, message: '请选择回款渠道', @@ -432,6 +423,19 @@ e.target.value = parseFloat(e.target.value) } }, + checkDiff() { + this.$confirm('此操作将重置当日保存的回款分析记录, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$message({ + type: 'success', + message: '删除成功!' + }) + }).catch(() => { + }) + }, handleReturn(isreload) { this.active = 0 this.imgList = [] diff --git a/supervise-wx-mp/pages.json b/supervise-wx-mp/pages.json index f5f2cf8b..ca94912a 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/demoReportKc", + "style": { + "navigationBarTitleText": "质物库存汇总" + } + },{ "path": "pages/index/auditReport", "style": { "navigationBarTitleText": "回款报告" diff --git a/supervise-wx-mp/pages/index/demoReportKc.vue b/supervise-wx-mp/pages/index/demoReportKc.vue new file mode 100644 index 00000000..f16c4c1d --- /dev/null +++ b/supervise-wx-mp/pages/index/demoReportKc.vue @@ -0,0 +1,1228 @@ + + + + + \ No newline at end of file