yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

aa

master
liupopo 2 years ago
parent
b394e733de
commit
e4d50c92a6
6 changed files with 1271 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      docs/databases/table_create_customer-cashed.sql
  2. BIN
      docs/云梦瀚川货物明细字段与接口对应关系.xlsx
  3. BIN
      docs/证书/10734649_supervise.yxtsoft.com_nginx.zip
  4. 68
      supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue
  5. 5
      supervise-wx-mp/pages.json
  6. 1228
      supervise-wx-mp/pages/index/demoReportKc.vue

4
docs/databases/table_create_customer-cashed.sql
View File

@ -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 '到账周期天数',

BIN
docs/云梦瀚川货物明细字段与接口对应关系.xlsx
View File

Binary file not shown.

BIN
docs/证书/10734649_supervise.yxtsoft.com_nginx.zip
View File

Binary file not shown.

68
supervise-customer-ui/src/views/daydataupload/cash/cashedit.vue
View File

@ -29,22 +29,15 @@
<el-table show-summary :data="saleslist" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" align="center" prop="serialNumber" />
<el-table-column label="销售日期" align="center" width="120" prop="dataDate" />
<el-table-column label="支付渠道" align="center" width="140" prop="disbursementChannelName" />
<el-table-column label="支付渠道" align="center" width="160" prop="disbursementChannelName" />
<el-table-column label="金额（元）" align="center" width="120" prop="amount" />
<el-table-column label="对应公司主体" align="center" width="200" prop="CompanyName" />
<el-table-column label="到账周期" align="center" width="100" prop="accountCycleDays" />
<el-table-column
prop="antipateCashedDate"
label="日期"
width="120"
>
<el-table-column label="对应公司主体" align="center" width="120" prop="companyName" />
<el-table-column label="到账周期" align="center" width="200" prop="accountCycle" />
<el-table-column prop="antipateCashedDate" label="日期" width="170" align="center">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.antipateCashedDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" />
<el-date-picker v-model="scope.row.antipateCashedDate" style="width: 140px;" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" />
</template>
</el-table-column>
<el-table-column label="财务到账金额" align="center" width="120" prop="inaccountAmount" />
<el-table-column label="到账差额" align="center" width="120" prop="differentAmount" />
<el-table-column label="差额预计到账时间" align="center" width="150" prop="antipateDifferentDate" />
<el-table-column label="备注" show-overflow-tooltip prop="remarks" />
</el-table>
</el-collapse-item>
@ -62,7 +55,7 @@
</span>
</div>
</div>
<el-table :data="incomelist" border style="width: 100%">
<el-table show-summary :data="incomelist" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" align="center" prop="serialNumber" />
<el-table-column label="回款日期" align="center" width="120" prop="dataDate" />
<el-table-column label="回款渠道" align="center" width="140" prop="collectionChannelName" />
@ -84,23 +77,26 @@
<div>回款分析</div>
<div>
<span style="padding-right: 20px">合计数量:</span>
<span>合计金额:</span>
<span style="padding-right: 20px">合计金额:</span>
<span style="padding-right: 20px">
<el-button plain size="small" type="success" icon="el-icon-plus" @click="checkDiff">回款分析</el-button>
<el-button plain size="small" type="primary" icon="el-icon-plus" @click="showIncomeAdd">新增分析记录</el-button>
<el-button plain size="small" type="danger" icon="el-icon-circle-check" @click="incomeListSave">保存回款分析</el-button>
</span>
</div>
</div>
<el-table :data="differentlist" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" align="center" prop="serialNumber" />
<el-table-column label="销售日期" align="center" width="100" prop="saleDate" />
<el-table-column label="支付渠道" align="center" prop="disbursementChannelName" />
<el-table-column label="金额（元）" align="center" width="100" prop="amount" />
<el-table-column label="对应公司主体" align="center" width="100" prop="CompanyName" />
<el-table-column label="回款周期" align="center" width="100" prop="accountCycle" />
<el-table-column label="T+" align="center" width="100" prop="accountCycleDays" />
<el-table-column label="应回款日期" align="center" width="150" prop="antipateCashedDate" />
<el-table-column label="实际回款日期" align="center" width="100" prop="realCashedDate" />
<el-table-column label="回款金额" align="center" width="150" prop="cashedAmount" />
<el-table-column label="回款差额" align="center" width="150" prop="differentAmount" />
<el-table-column label="差额预计到账日期" align="center" width="150" prop="antipateDifferentDate" />
<el-table-column label="备注" show-overflow-tooltip align="center" width="150" prop="remarks" />
<el-table-column label="销售日期" align="center" width="120" prop="saleDate" />
<el-table-column label="支付渠道" align="center" width="120" prop="disbursementChannelName" />
<el-table-column label="金额（元）" align="center" width="120" prop="amount" />
<el-table-column label="对应公司主体" align="center" width="120" prop="CompanyName" />
<el-table-column label="回款周期" align="center" width="120" prop="accountCycle" />
<el-table-column label="应回款日期" align="center" width="120" prop="antipateCashedDate" />
<el-table-column label="实际回款日期" align="center" width="120" prop="realCashedDate" />
<el-table-column label="回款金额" align="center" width="100" prop="cashedAmount" />
<el-table-column label="回款差额" align="center" width="100" prop="differentAmount" />
<el-table-column label="备注" show-overflow-tooltip prop="remarks" />
</el-table>
</el-collapse-item>
</el-collapse>
@ -115,7 +111,7 @@
<span>回款日期</span>
</el-col>
<el-col :span="18" class="trightb">
<el-form-item prop="dataDate"> <el-date-picker v-model="incomeObj.dataDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" /></el-form-item>
<el-form-item>{{ incomeObj.dataDate }}</el-form-item>
</el-col>
</el-row>
<el-row>
@ -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 = []

5
supervise-wx-mp/pages.json
View File

@ -1,6 +1,11 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/demoReportKc",
"style": {
"navigationBarTitleText": "质物库存汇总"
}
},{
"path": "pages/index/auditReport",
"style": {
"navigationBarTitleText": "回款报告"

1228
supervise-wx-mp/pages/index/demoReportKc.vue
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save