yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善回款返利核对

master
yunuo970428 6 months ago
parent
13b6a0573b
commit
0b4b501481
17 changed files with 801 additions and 1604 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
      anrui-scm/anrui-scm-ui/src/api/manufacturerrebates/collectionrebatecheck.js
  2. 96
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue
  3. 381
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
  4. 103
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue
  5. 112
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
  6. 211
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
  7. 158
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue
  8. 123
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue
  9. 86
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue
  10. 157
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue
  11. 14
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
  12. 113
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue
  13. 377
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue
  14. 98
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue
  15. 125
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue
  16. 88
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue
  17. 159
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue

4
anrui-scm/anrui-scm-ui/src/api/manufacturerrebates/collectionrebatecheck.js
View File

@ -73,9 +73,9 @@ export default {
})
},
// 查看明细
collectionRebateWithDetails: function(data) {
collectionRebateCheckDetails: function(data) {
return request({
url: '/scm/v1/scmcollectionrebatewith/collectionRebateWithDetails/' + data,
url: '/scm/v1/scmcollectionrebatecheckapplydetail/collectionRebateCheckDetails/' + data,
method: 'get'
})
},

96
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue
View File

@ -12,19 +12,28 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="品牌">
<el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
</el-select>
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请标题">
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请名称">
<el-input v-model="listQuery.params.checkApply" placeholder="" clearable/>
</el-form-item>
<el-form-item label="创建日期">
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.finishTimeStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.finishTimeEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@ -52,51 +61,19 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column label="分公司" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="名称" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.checkApply }}回款返利核对审核申请</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" width="200">
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column label="申请名称" align="center" min-width="200">
<template slot-scope="scope">
<span>{{ scope.row.createByName }}</span>
<span>{{ scope.row.checkApply }}回款返利核对申请</span>
</template>
</el-table-column>
<el-table-column prop="estimateRebate" label="预提返利" align="center" width="140" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="140" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="140" />
<el-table-column prop="createByName" label="创建人" align="center" width="130" />
<el-table-column prop="deptName" label="申请部门" align="center" width="150" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
</el-table>
</div>
<div class="pages">
@ -118,7 +95,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import collectionrebatecheckedAdd from './collectionrebatecheckedAdd'
import collectionrebatecheckedInfo from './collectionrebatecheckedInfo'
import { getStorage } from '@/utils/auth'
@ -163,14 +140,17 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
brand_list: '',
listQuery: {
params: {
brandSid: '',
useOrgName: '',
deptName: '',
createByName: '',
checkApply: '',
createOrgSid: '',
createEndTime: '',
createStartTime: '',
finishTimeStart: '',
finishTimeEnd: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -225,11 +205,6 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
this.getList()
}
})
@ -279,7 +254,7 @@ export default {
req.pagelist(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@ -296,11 +271,15 @@ export default {
handleReset() {
this.listQuery = {
params: {
brandSid: '',
useOrgName: '',
deptName: '',
createByName: '',
checkApply: '',
createOrgSid: '',
createEndTime: '',
createStartTime: '',
finishTimeStart: '',
finishTimeEnd: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -313,6 +292,7 @@ export default {
},
handleClick() {
this.$parent.resetState()
this.$parent.handleReset()
},
toEdit(row) {
this.viewState = 2

381
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
View File

@ -7,10 +7,8 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -18,49 +16,19 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>{{ formobj.checkApply }}回款返利核对审核申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="4" class="colOneStyle">
<el-form-item>
<el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18" class="tleftb colOneStyle">
<el-button size="small" type="primary" @click="handleSelect()">添加</el-button>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">添加</el-button></div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmWhenCollectionrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="回款方式" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="estimateRebate" label="预提返利" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
@ -68,45 +36,24 @@
</el-table-column>
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable></el-input></el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>预提返利本月核对情况</div>
</div>
<el-table :key="lastVehrebateKey" :data="formobj.scmLastCollectionrebateCheckapplydetailDetails" border style="width: 100%">
<el-table-column label="预提年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="estimateRebate" label="预提金额" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<span>{{ scope.row.notUploadedCost }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -121,7 +68,7 @@
<script>
import req from '@/api/manufacturerrebates/collectionrebatecheck'
import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
import { fetchBySid } from '@/api/cheliang/dictcommons'
import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli'
import heduishenpiAdd from './relation/heduishenpiAdd'
@ -138,15 +85,13 @@ export default {
index: 0,
tableKey: 0,
lastVehrebateKey: 1,
dialogStatus: '',
brand_list: [],
// 表单数据
formobj: {
sid: '',
createByName: '',
createBySid: '',
brandName: '',
brandSid: '',
deptName: '',
deptSid: '',
checkApply: '',
createOrgName: '',
createOrgSid: '',
@ -157,7 +102,8 @@ export default {
taskId: '', // 任务ID
orgPath: '',
scmWhenCollectionrebateCheckapplydetailDetails: [],
scmLastCollectionrebateCheckapplydetailDetails: []
scmLastCollectionrebateCheckapplydetailDetails: [],
scmCollectionrebateCheckapplydetailVos: []
},
rules: {},
submitdisabled: false
@ -178,11 +124,6 @@ export default {
this.formobj.useOrgName = res.data.name
}
})
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
showAdd(createOrgSid) {
this.$nextTick(() => {
@ -190,19 +131,19 @@ export default {
this.init()
this.newDate()
})
this.dialogStatus = 'add'
this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
this.viewTitle = '【新增】回款返利核对审核申请'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】回款返利核对审核申请'
console.log('编辑回显', row.sid)
req.fetchDetailsBySid(row.sid).then((resp) => {
@ -214,153 +155,148 @@ export default {
this.formobj = row
})
},
changeBrand(value) {
const choose = this.brand_list.filter((item) => item.brandName === value)
if (choose !== null && choose.length > 0) {
this.formobj.brandSid = choose[0].sid
} else {
this.formobj.brandSid = ''
}
},
// 明细表添加一行数据
handleSelect() {
if (this.formobj.brandName === '' || this.formobj.brandName === null || this.formobj.brandName === undefined) {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.viewState = 2
this.$refs['divSelect'].showData(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails, this.formobj.scmLastCollectionrebateCheckapplydetailDetails, this.formobj.createOrgSid, this.formobj.brandSid)
this.$refs['divSelect'].showData(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails, this.formobj.createOrgSid)
},
backData(value, val) {
backData(val) {
this.viewState = 1
if (value.length > 0) {
for (var i in value) {
let cval = value[i]
if (!this.formobj.scmWhenCollectionrebateCheckapplydetailDetails || this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.length === 0) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails = []
}
let v = 0
for (var j in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionTypeValue === cval.collectionTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseFloat(cval.collectionMoney)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseFloat(cval.estimateRebate)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseFloat(cval.uploadMoney)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionRebateSids.push(cval.sid)
v = 1
break
}
}
if (v === 0) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.push({
collectionTypeKey: cval.collectionTypeKey,
collectionTypeValue: cval.collectionTypeValue,
collectionMoney: cval.collectionMoney,
estimateRebate: cval.estimateRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
uploadMoney: cval.uploadMoney,
adjustmentMoney: cval.adjustmentMoney,
collectionRebateSids: [cval.sid],
sid: '',
mainSid: ''
})
var list = JSON.parse(JSON.stringify(val))
// 同一数据源
list.forEach((e) => {
this.formobj.scmCollectionrebateCheckapplydetailVos.push(e)
})
// 将同一数据源进行拆分(1.按照返利类型统计 2.按照预提年月统计)
// 按照返利类型统计
list.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney : 0) + parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].collectionRebateSids.push(e.sid)
v = 1
break
}
}
}
if (val.length > 0) {
for (var p in val) {
let bval = val[p]
if (!this.formobj.scmLastCollectionrebateCheckapplydetailDetails || this.formobj.scmLastCollectionrebateCheckapplydetailDetails.length === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails = []
}
let v = 0
for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseFloat(bval.collectionMoney)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseFloat(bval.estimateRebate)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseFloat(bval.uploadMoney)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseFloat(bval.adjustmentMoney)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(bval.sid)
v = 1
break
}
}
if (v === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails.push({
withholdingDate: bval.withholdingDate,
collectionMoney: bval.collectionMoney,
estimateRebate: bval.estimateRebate,
uploadMoney: bval.uploadMoney,
adjustmentMoney: bval.adjustmentMoney,
notUploadedCost: '',
collectionRebateSids: [bval.sid],
sid: '',
mainSid: ''
})
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.push({
rebateTypeKey: e.rebateTypeKey,
rebateTypeValue: e.rebateTypeValue,
num: 1,
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
adjustmentMoney: e.adjustmentMoney,
collectionRebateSids: [e.sid],
sid: '',
mainSid: ''
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num) + parseFloat(1)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney : 0) + parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(s.sid)
k = 1
break
}
}
}
if (k === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
num: 1,
estimateRebate: s.estimateRebate,
uploadMoney: s.uploadMoney,
adjustmentMoney: s.adjustmentMoney,
collectionRebateSids: [s.sid],
sid: '',
mainSid: ''
})
}
})
},
handleLook(row) {
this.viewState = 3
this.$refs['divAdd'].showInfo(row)
this.$refs['divAdd'].showInfo(row, this.formobj.scmCollectionrebateCheckapplydetailVos)
},
backAdd(value, collectionTypeValue) {
backAdd(val) {
this.viewState = 1
const aa = []
if (value.length > 0) {
for (var i in value) {
let cval = value[i]
let v = 0
for (var j in aa) {
if (aa[j].collectionTypeValue === cval.collectionTypeValue) {
aa[j].collectionMoney = parseFloat(aa[j].collectionMoney) + parseFloat(cval.collectionMoney)
aa[j].estimateRebate = parseFloat(aa[j].estimateRebate) + parseFloat(cval.estimateRebate)
aa[j].uploadMoney = parseFloat(aa[j].uploadMoney) + parseFloat(cval.uploadMoney)
aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
aa[j].collectionRebateSids.push(cval.sid)
v = 1
break
}
}
if (v === 0) {
aa.push({
collectionTypeKey: cval.collectionTypeKey,
collectionTypeValue: cval.collectionTypeValue,
collectionMoney: cval.collectionMoney,
estimateRebate: cval.estimateRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
uploadMoney: cval.uploadMoney,
adjustmentMoney: cval.adjustmentMoney,
collectionRebateSids: [cval.sid],
sid: '',
mainSid: ''
})
}
}
for (var k = 0; k < this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.length; k++) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionTypeValue === collectionTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionTypeKey = aa[0].collectionTypeKey
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionTypeValue = aa[0].collectionTypeValue
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].estimateRebate = aa[0].estimateRebate
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].brandName = aa[0].brandName
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].brandSid = aa[0].brandSid
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].uploadMoney = aa[0].uploadMoney
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].adjustmentMoney = aa[0].adjustmentMoney
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionRebateSids = aa[0].collectionRebateSids
// 先将数据清空
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails = []
this.formobj.scmLastCollectionrebateCheckapplydetailDetails = []
this.formobj.scmCollectionrebateCheckapplydetailVos = []
var list = JSON.parse(JSON.stringify(val))
// 同一数据源
list.forEach((e) => {
this.formobj.scmCollectionrebateCheckapplydetailVos.push(e)
})
// 将同一数据源进行拆分(1.按照返利类型统计 2.按照预提年月统计)
// 按照返利类型统计
list.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney : 0) + parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].collectionRebateSids.push(e.sid)
v = 1
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.length; l++) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[l].collectionTypeValue === collectionTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.splice(l, 1)
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.push({
rebateTypeKey: e.rebateTypeKey,
rebateTypeValue: e.rebateTypeValue,
num: 1,
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
adjustmentMoney: e.adjustmentMoney,
collectionRebateSids: [e.sid],
sid: '',
mainSid: ''
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num) + parseFloat(1)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney : 0) + parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(s.sid)
k = 1
break
}
}
}
if (k === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
num: 1,
estimateRebate: s.estimateRebate,
uploadMoney: s.uploadMoney,
adjustmentMoney: s.adjustmentMoney,
collectionRebateSids: [s.sid],
sid: '',
mainSid: ''
})
}
})
},
resetState() {
this.viewState = 1
@ -410,8 +346,8 @@ export default {
sid: '',
createByName: '',
createBySid: '',
brandName: '',
brandSid: '',
deptName: '',
deptSid: '',
checkApply: '',
createOrgName: '',
createOrgSid: '',
@ -422,7 +358,8 @@ export default {
taskId: '', // 任务ID
orgPath: '',
scmWhenCollectionrebateCheckapplydetailDetails: [],
scmLastCollectionrebateCheckapplydetailDetails: []
scmLastCollectionrebateCheckapplydetailDetails: [],
scmCollectionrebateCheckapplydetailVos: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
@ -438,5 +375,15 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
</style>

103
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue
View File

@ -14,44 +14,14 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>{{ formobj.checkApply }}回款返利核对审核申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="20" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-table :key="tableKey" :data="formobj.scmWhenCollectionrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="回款方式" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="estimateRebate" label="预提返利" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
@ -59,45 +29,22 @@
</el-table-column>
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>预提返利本月核对情况</div>
</div>
<div class="title">预提返利本月核对情况</div>
<el-table :key="lastVehrebateKey" :data="formobj.scmLastCollectionrebateCheckapplydetailDetails" border style="width: 100%">
<el-table-column label="预提年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="estimateRebate" label="预提金额" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<span>{{ scope.row.notUploadedCost }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -105,7 +52,7 @@
</div>
</div>
<!--End 添加修改部分-->
<heduishenpiInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<heduishenpiInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
</div>
</template>
@ -154,8 +101,7 @@ export default {
this.viewState = 1
},
// 返回（===既判断）
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
// 表单数据
this.formobj = {}
this.$refs['form_obj'].resetFields()
@ -165,12 +111,11 @@ export default {
}
</script>
<style scoped>
.rowStyle {
border-left: 0px;
.span-sty {
width: 130px !important;
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
.addinputInfo {
margin-left: 120px !important;
}
</style>

112
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
View File

@ -12,6 +12,15 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购系统">
<el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="回款方式">
<el-select v-model="listQuery.params.collectionTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in collectionType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -22,6 +31,14 @@
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.collectionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="预提日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
@ -47,66 +64,25 @@
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -193,11 +169,16 @@ export default {
list: [],
sids: [],
FormLoading: false,
rebateType_list: [],
collectionType_list: [],
listLoading: false,
listQuery: {
params: {
brandSid: '',
createOrgName: '',
purchaseSystemName: '',
brandName: '',
rebateTypeKey: '',
rebateName: '',
collectionEndDate: '',
collectionStartDate: '',
createStartTime: '',
@ -291,7 +272,7 @@ export default {
req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@ -308,7 +289,11 @@ export default {
handleReset() {
this.listQuery = {
params: {
brandSid: '',
createOrgName: '',
purchaseSystemName: '',
brandName: '',
rebateTypeKey: '',
rebateName: '',
collectionEndDate: '',
collectionStartDate: '',
createStartTime: '',
@ -353,6 +338,7 @@ export default {
},
handleClick() {
this.viewState = 4
this.$refs['divCheck'].init()
},
toAdd() {
this.viewState = 5

211
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
View File

@ -16,107 +16,69 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>回款返利</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb">
<span>回款方式</span>
<el-col :span="8">
<div class="span-sty">回款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.collectionTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.collectionTypeValue }}</span>
</el-form-item>
<el-col :span="8">
<div class="span-sty">回款日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.collectionDate }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>回款金额</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.collectionMoney }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>回款日期</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.collectionDate }}</span>
</el-form-item>
<el-col :span="8">
<div class="span-sty">回款金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.collectionMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>预计返利</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.estimateRebate }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>上传金额</span>
<el-col :span="8">
<div class="span-sty">返利类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item><el-input v-model="formobj.uploadMoney" class="addinputw" placeholder="" @keyup.native="UpNumber" clearable></el-input></el-form-item>
<el-col :span="8">
<div class="span-sty">返利名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>上传日期</span>
</el-col>
<el-col :span="5">
<el-form-item><el-date-picker v-model="formobj.uploadDate" type="date" class="addinputw" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
<el-col :span="8">
<div class="span-sty">预计返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>调整金额</span>
<el-col :span="8">
<div class="span-sty">上传日期</div>
<el-form-item><el-date-picker class="addinputInfo" v-model="formobj.uploadDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ adjustmentMoney() }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">上传金额</div>
<el-form-item><el-input class="addinputInfo addinputw" @input="adjustmentMoneyInput()" v-model="formobj.uploadMoney" @keyup.native="formobj.uploadMoney = getNumber(formobj.uploadMoney, 2)" placeholder="" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>调整说明</span>
<el-col :span="8">
<div class="span-sty">调整金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
</el-col>
<el-col :span="13">
<el-form-item><el-input v-model="formobj.remarks" class="addinputw" placeholder="" clearable></el-input></el-form-item>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">调整说明</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.adjustmentRemarks" placeholder="" clearable /></el-form-item>
</el-col>
</el-row>
<div class="title">
<div class="title titleOne">
<div>车辆回款返利列表</div>
<div>
<el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleRebate()">上传金额分配</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.scmCollectionRebateVehs" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.carModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="costPrice" label="回款金额" align="center" width="130" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
</el-table>
</el-form>
</div>
@ -137,41 +99,32 @@ export default {
tableKey: 0,
viewState: 1,
// 表单数据
formobj: {
sid: '',
collectionTypeKey: '',
collectionTypeValue: '',
manufaSaleChannel: '',
collectionMoney: '',
collectionDate: '',
freight: '',
calculationStandard: '',
estimateRebate: '',
useOrgSid: '',
useOrgName: '',
createOrgName: '',
createOrgSid: '',
scmCollectionRebateVehs: []
},
formobj: {},
rules: {},
submitdisabled: false
}
},
computed: {
},
methods: {
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
// 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
console.log(e.target.value)
e.target.value = parseFloat(e.target.value)
}
},
adjustmentMoney() {
if (this.formobj.uploadMoney !== '') {
this.formobj.adjustmentMoney = parseFloat(this.formobj.uploadMoney) - parseFloat(this.formobj.estimateRebate)
return this.formobj.adjustmentMoney
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0
val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
/^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
// 不需要小数点
val = val.replace(reg, '$1')
} else {
// 通过正则保留小数点后指定的位数
val = val.replace(reg, '$1.$2')
}
return val
},
showEdit(row) {
this.$nextTick(() => {
@ -184,12 +137,15 @@ export default {
})
this.viewTitle = '【新增】回款返利'
},
adjustmentMoneyInput() {
this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.estimateRebate)) * 100) / 100
},
// 明细表添加一行数据
handleRebate() {
if (this.formobj.scmCollectionRebateVehs.length !== 0) {
for (var i = 0; i < this.formobj.scmCollectionRebateVehs.length; i++) {
this.formobj.scmCollectionRebateVehs[i].uploadMoney = Math.round((parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate) / parseFloat(this.formobj.estimateRebate) * parseFloat(this.formobj.uploadMoney)) * 100) / 100
this.formobj.scmCollectionRebateVehs[i].adjustmentMoney = parseFloat(this.formobj.scmCollectionRebateVehs[i].uploadMoney) - parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate)
this.formobj.scmCollectionRebateVehs[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmCollectionRebateVehs[i].uploadMoney) - parseFloat(this.formobj.scmCollectionRebateVehs[i].estimateRebate)) * 100) / 100
}
}
},
@ -200,11 +156,7 @@ export default {
req.save(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
}
}).catch(() => {
@ -219,21 +171,7 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
// 表单数据
this.formobj = {
rebateTypeKey: '',
rebateTypeValue: '',
rebateName: '',
palceGenDate: '',
calculationModeKey: '',
calculationModeValue: '',
calculationStandard: '',
sid: '',
createOrgSid: '',
createOrgName: '',
useOrgSid: '',
useOrgName: '',
scmCollectionRebateVehs: []
}
this.formobj = {}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
@ -241,12 +179,25 @@ export default {
}
</script>
<style scoped>
.title {
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
</style>

158
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue
View File

@ -14,98 +14,64 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>回款返利核对</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb">
<span>回款方式</span>
<el-col :span="8">
<div class="span-sty">回款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.collectionTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.collectionTypeValue }}</span>
</el-form-item>
<el-col :span="8">
<div class="span-sty">回款日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.collectionDate }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>回款金额</span>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.collectionMoney }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>回款日期</span>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.collectionDate }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">回款金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.collectionMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>预计返利</span>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.estimateRebate }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>上传金额</span>
<el-col :span="8">
<div class="span-sty">返利类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.uploadMoney }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">返利名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>上传日期</span>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.uploadDate }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">预计返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>调整金额</span>
<el-col :span="8">
<div class="span-sty">上传日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.uploadDate }}</span></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.adjustmentMoney }}</span></el-form-item>
<el-col :span="8">
<div class="span-sty">上传金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.uploadMoney }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>调整说明</span>
<el-col :span="8">
<div class="span-sty">调整金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
</el-col>
<el-col :span="13">
<el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">调整说明</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.adjustmentRemarks" placeholder="" clearable /></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆回款返利列表</div>
</div>
<div class="title">车辆回款返利列表</div>
<el-table :key="tableKey" :data="formobj.scmCollectionRebateVehs" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.carModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="costPrice" label="回款金额" align="center" width="130" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
</el-table>
</el-form>
</div>
@ -127,22 +93,7 @@ export default {
viewState: 1,
rebateType_list: [], // 返利类型
// 表单数据
formobj: {
sid: '',
collectionTypeKey: '',
collectionTypeValue: '',
manufaSaleChannel: '',
collectionMoney: '',
collectionDate: '',
freight: '',
calculationStandard: '',
estimateRebate: '',
useOrgSid: '',
useOrgName: '',
createOrgName: '',
createOrgSid: '',
scmCollectionRebateVehs: []
},
formobj: {},
rules: {},
submitdisabled: false
}
@ -161,24 +112,9 @@ export default {
},
// 返回（===既判断）
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
// 表单数据
this.formobj = {
rebateTypeKey: '',
rebateTypeValue: '',
rebateName: '',
palceGenDate: '',
calculationModeKey: '',
calculationModeValue: '',
calculationStandard: '',
sid: '',
createOrgSid: '',
createOrgName: '',
useOrgSid: '',
useOrgName: '',
scmCollectionRebateVehs: []
}
this.formobj = {}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
@ -186,5 +122,11 @@ export default {
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

123
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue
View File

@ -17,67 +17,26 @@
<el-form ref="form_obj" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column fixed label="序号" type="index" :index="index + 1" align="center" width="80px"/>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -97,8 +56,8 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
collectionTypeValue: '',
sids: [],
scmCollectionrebateCheckapplydetailVos: [],
// 表单数据
list: [],
rules: {},
@ -114,26 +73,24 @@ export default {
this.sids = aa
console.log('sids', this.sids)
},
showInfo(row) {
showInfo(row, value) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '回款返利核对审核申请明细'
this.collectionTypeValue = row.collectionTypeValue
console.log('编辑回显', row)
req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
this.list = resp.data
req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
this.scmCollectionrebateCheckapplydetailVos = value
}
}).catch((e) => {
this.list = []
})
},
handleDelete() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
for (var i = 0; i < this.list.length; i++) {
@ -143,25 +100,17 @@ export default {
}
}
}
for (var l = 0; l < this.scmCollectionrebateCheckapplydetailVos.length; l++) {
for (var p = 0; p < this.sids.length; p++) {
if (this.scmCollectionrebateCheckapplydetailVos[l].sid === this.sids[p]) {
this.scmCollectionrebateCheckapplydetailVos.splice(l, 1)
}
}
}
},
// 返回（===既判断）
handleReturn() {
// 表单数据
const data_list = []
for (var i = 0; i < this.list.length; i++) {
data_list.push({
sid: this.list[i].sid,
collectionTypeValue: this.list[i].collectionTypeValue,
collectionTypeKey: this.list[i].collectionTypeKey,
collectionMoney: this.list[i].collectionMoney,
estimateRebate: this.list[i].estimateRebate,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid,
uploadMoney: this.list[i].uploadMoney,
adjustmentMoney: this.list[i].adjustmentMoney
})
}
this.$emit('backAdd', data_list, this.collectionTypeValue)
this.$emit('backAdd', this.scmCollectionrebateCheckapplydetailVos)
}
}
}

86
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue
View File

@ -16,66 +16,25 @@
<el-form ref="form_obj" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -95,7 +54,6 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
sids: [],
// 表单数据
list: [],
rules: {},
@ -109,8 +67,10 @@ export default {
})
this.viewTitle = '回款返利核对审核申请明细'
console.log('编辑回显', row)
req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
this.list = resp.data
req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
}
}).catch((e) => {
this.list = []
})

157
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue
View File

@ -2,75 +2,34 @@
<div class="app-container">
<!-- Start 列表页面 -->
<div>
<button-bar view-title="待核对回款返利列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="已上传待核对回款返利明细" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="listtop">
<div class="tit">待核对回款返利列表</div>
<div class="tit">已上传待核对回款返利列表</div>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -118,12 +77,10 @@ export default {
tableKey: 0,
list: [],
sids: [],
sids_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
brandSid: '',
createOrgSid: '',
sidList: []
},
@ -171,40 +128,7 @@ export default {
return pageindex
},
handleSelectionChange(row) {
var dateTime = ''
let date = new Date()
let year = date.getFullYear() // 年
let month = date.getMonth() + 1 // 月
dateTime = year + '年' + month + '月'
const aa = []
const bb = []
row.forEach((element) => {
if (element.withholdingDateCopy === dateTime) {
aa.push({
sid: element.sid,
collectionTypeValue: element.collectionTypeValue,
collectionTypeKey: element.collectionTypeKey,
collectionMoney: element.collectionMoney,
estimateRebate: element.estimateRebate,
brandName: element.brandName,
brandSid: element.brandSid,
uploadMoney: element.uploadMoney,
adjustmentMoney: element.adjustmentMoney
})
} else {
bb.push({
sid: element.sid,
withholdingDate: element.withholdingDateCopy,
collectionMoney: element.collectionMoney,
estimateRebate: element.estimateRebate,
uploadMoney: element.uploadMoney,
adjustmentMoney: element.adjustmentMoney
})
}
})
this.sids = aa
this.sids_list = bb
console.log('sids', this.sids, bb, 99999999)
this.sids = row
},
// 查询列表信息
getList() {
@ -212,7 +136,7 @@ export default {
req.checkApplyGetAlreadyUploadCollectionRebate(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@ -221,9 +145,8 @@ export default {
}
})
},
showData(value, val, createOrgSid, brandSid) {
showData(value, createOrgSid) {
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.params.brandSid = brandSid
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
@ -232,26 +155,7 @@ export default {
}
}
}
const bb = []
if (val.length > 0) {
for (var k = 0; k < val.length; k++) {
for (var l = 0; l < val[k].collectionRebateSids.length; l++) {
bb.push(val[k].collectionRebateSids[l])
}
}
}
if (aa.length > 0 && bb.length > 0) {
this.listQuery.params.sidList = aa
for (var p = 0; p < bb.length; p++) {
this.listQuery.params.sidList.push(bb[p])
}
} else if (aa.length > 0 && bb.length === 0) {
this.listQuery.params.sidList = aa
} else if (aa.length === 0 && bb.length > 0) {
this.listQuery.params.sidList = bb
} else if (aa.length === 0 && bb.length === 0) {
this.listQuery.params.sidList = []
}
this.listQuery.params.sidList = aa
this.getList()
},
// 查询按钮
@ -273,15 +177,10 @@ export default {
this.getList()
},
doConfirm() {
if (this.sids.length > 0 || this.sids_list.length > 0) {
this.$emit('backData', this.sids, this.sids_list)
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请选择至少一条记录!',
type: 'error',
duration: 2000
})
this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
}
},
doClose() {

14
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
View File

@ -26,9 +26,9 @@
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.closeStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.finishTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.closeEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="listQuery.params.finishTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -68,7 +68,7 @@
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
</el-table>
</div>
<div class="pages">
@ -151,8 +151,8 @@ export default {
collectionApply: '',
createEndTime: '',
createStartTime: '',
closeStartDate: '',
closeEndDate: '',
finishTimeStart: '',
finishTimeEnd: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -283,8 +283,8 @@ export default {
collectionApply: '',
createEndTime: '',
createStartTime: '',
closeStartDate: '',
closeEndDate: '',
finishTimeStart: '',
finishTimeEnd: '',
orgPath: '',
userSid: '',
menuUrl: ''

113
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue
View File

@ -16,44 +16,14 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.checkApply }}回款返利核对审核申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="20" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-table :key="tableKey" :data="formobj.scmWhenCollectionrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="回款方式" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="estimateRebate" label="预提返利" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
@ -61,65 +31,41 @@
</el-table-column>
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>预提返利本月核对情况</div>
</div>
<div class="title">预提返利本月核对情况</div>
<el-table :key="lastVehrebateKey" :data="formobj.scmLastCollectionrebateCheckapplydetailDetails" border style="width: 100%">
<el-table-column label="预提年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="estimateRebate" label="预提金额" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<span>{{ scope.row.notUploadedCost }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
<heduishenpiInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{ rowClass:!currentLink }">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -355,15 +301,14 @@ export default {
text-align: center;
padding: 30px 0 20px 0;
}
.rowStyle {
border-left: 0px;
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

377
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue
View File

@ -17,49 +17,19 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.checkApply }}回款返利核对审核申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="4" class="colOneStyle">
<el-form-item>
<el-select :disabled="dialogStatus === 'edit'" v-model="formobj.brandName" placeholder="请选择" filterable clearable @change="changeBrand">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="18" class="tleftb colOneStyle">
<el-button size="small" type="primary" @click="handleSelect()">添加</el-button>
<el-col :span="24" class="colOneStyle">
<div style="text-align: right"><el-button size="small" type="primary" class="btntopblueline" @click="handleSelect()">添加</el-button></div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.scmWhenCollectionrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="回款方式" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="estimateRebate" label="预提返利" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
@ -67,45 +37,24 @@
</el-table-column>
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable></el-input></el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw"></el-input></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>预提返利本月核对情况</div>
</div>
<el-table :key="lastVehrebateKey" :data="formobj.scmLastCollectionrebateCheckapplydetailDetails" border style="width: 100%">
<el-table-column label="预提年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="estimateRebate" label="预提金额" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<span>{{ scope.row.notUploadedCost }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -120,7 +69,7 @@
<script>
import req from '@/api/bikerebate/bicyclerebatecheck'
import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
import { fetchBySid } from '@/api/cheliang/dictcommons'
import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli'
import heduishenpiAdd from './relation/heduishenpiAdd'
@ -137,15 +86,13 @@ export default {
index: 0,
tableKey: 0,
lastVehrebateKey: 1,
dialogStatus: '',
brand_list: [],
// 表单数据
formobj: {
sid: '',
createByName: '',
createBySid: '',
brandName: '',
brandSid: '',
deptName: '',
deptSid: '',
checkApply: '',
createOrgName: '',
createOrgSid: '',
@ -156,7 +103,8 @@ export default {
taskId: '', // 任务ID
orgPath: '',
scmWhenCollectionrebateCheckapplydetailDetails: [],
scmLastCollectionrebateCheckapplydetailDetails: []
scmLastCollectionrebateCheckapplydetailDetails: [],
scmCollectionrebateCheckapplydetailVos: []
},
rules: {},
submitdisabled: false
@ -187,17 +135,11 @@ export default {
this.formobj.useOrgName = res.data.name
}
})
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】回款返利核对审核申请'
console.log('编辑回显', sid)
req.fetchDetailsBySid(sid).then((resp) => {
@ -209,153 +151,148 @@ export default {
this.formobj = {}
})
},
changeBrand(value) {
const choose = this.brand_list.filter((item) => item.brandName === value)
if (choose !== null && choose.length > 0) {
this.formobj.brandSid = choose[0].sid
} else {
this.formobj.brandSid = ''
}
},
// 明细表添加一行数据
handleSelect() {
if (this.formobj.brandName === '' || this.formobj.brandName === null || this.formobj.brandName === undefined) {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.viewState = 2
this.$refs['divSelect'].showData(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails, this.formobj.scmLastCollectionrebateCheckapplydetailDetails, this.formobj.createOrgSid, this.formobj.brandSid)
this.$refs['divSelect'].showData(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails, this.formobj.createOrgSid)
},
backData(value, val) {
backData(val) {
this.viewState = 1
if (value.length > 0) {
for (var i in value) {
let cval = value[i]
if (!this.formobj.scmWhenCollectionrebateCheckapplydetailDetails || this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.length === 0) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails = []
}
let v = 0
for (var j in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionTypeValue === cval.collectionTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionMoney) + parseFloat(cval.collectionMoney)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].estimateRebate) + parseFloat(cval.estimateRebate)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].uploadMoney) + parseFloat(cval.uploadMoney)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[j].collectionRebateSids.push(cval.sid)
v = 1
break
}
}
if (v === 0) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.push({
collectionTypeKey: cval.collectionTypeKey,
collectionTypeValue: cval.collectionTypeValue,
collectionMoney: cval.collectionMoney,
estimateRebate: cval.estimateRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
uploadMoney: cval.uploadMoney,
adjustmentMoney: cval.adjustmentMoney,
collectionRebateSids: [cval.sid],
sid: '',
mainSid: ''
})
var list = JSON.parse(JSON.stringify(val))
// 同一数据源
list.forEach((e) => {
this.formobj.scmCollectionrebateCheckapplydetailVos.push(e)
})
// 将同一数据源进行拆分(1.按照返利类型统计 2.按照预提年月统计)
// 按照返利类型统计
list.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney : 0) + parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].collectionRebateSids.push(e.sid)
v = 1
break
}
}
}
if (val.length > 0) {
for (var p in val) {
let bval = val[p]
if (!this.formobj.scmLastCollectionrebateCheckapplydetailDetails || this.formobj.scmLastCollectionrebateCheckapplydetailDetails.length === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails = []
}
let v = 0
for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === bval.withholdingDate) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionMoney) + parseFloat(bval.collectionMoney)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate) + parseFloat(bval.estimateRebate)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney) + parseFloat(bval.uploadMoney)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney) + parseFloat(bval.adjustmentMoney)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(bval.sid)
v = 1
break
}
}
if (v === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails.push({
withholdingDate: bval.withholdingDate,
collectionMoney: bval.collectionMoney,
estimateRebate: bval.estimateRebate,
uploadMoney: bval.uploadMoney,
adjustmentMoney: bval.adjustmentMoney,
notUploadedCost: '',
collectionRebateSids: [bval.sid],
sid: '',
mainSid: ''
})
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.push({
rebateTypeKey: e.rebateTypeKey,
rebateTypeValue: e.rebateTypeValue,
num: 1,
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
adjustmentMoney: e.adjustmentMoney,
collectionRebateSids: [e.sid],
sid: '',
mainSid: ''
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num) + parseFloat(1)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney : 0) + parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(s.sid)
k = 1
break
}
}
}
if (k === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
num: 1,
estimateRebate: s.estimateRebate,
uploadMoney: s.uploadMoney,
adjustmentMoney: s.adjustmentMoney,
collectionRebateSids: [s.sid],
sid: '',
mainSid: ''
})
}
})
},
handleLook(row) {
this.viewState = 3
this.$refs['divAdd'].showInfo(row)
this.$refs['divAdd'].showInfo(row, this.formobj.scmCollectionrebateCheckapplydetailVos)
},
backAdd(value, collectionTypeValue) {
backAdd(value) {
this.viewState = 1
const aa = []
if (value.length > 0) {
for (var i in value) {
let cval = value[i]
let v = 0
for (var j in aa) {
if (aa[j].collectionTypeValue === cval.collectionTypeValue) {
aa[j].estimateRebate = parseFloat(aa[j].estimateRebate) + parseFloat(cval.estimateRebate)
aa[j].collectionMoney = parseFloat(aa[j].collectionMoney) + parseFloat(cval.collectionMoney)
aa[j].uploadMoney = parseFloat(aa[j].uploadMoney) + parseFloat(cval.uploadMoney)
aa[j].adjustmentMoney = parseFloat(aa[j].adjustmentMoney) + parseFloat(cval.adjustmentMoney)
aa[j].collectionRebateSids.push(cval.sid)
v = 1
break
}
}
if (v === 0) {
aa.push({
collectionTypeKey: cval.collectionTypeKey,
collectionTypeValue: cval.collectionTypeValue,
collectionMoney: cval.collectionMoney,
estimateRebate: cval.estimateRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
uploadMoney: cval.uploadMoney,
adjustmentMoney: cval.adjustmentMoney,
collectionRebateSids: [cval.sid],
sid: '',
mainSid: ''
})
}
}
for (var k = 0; k < this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.length; k++) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionTypeValue === collectionTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionTypeKey = aa[0].collectionTypeKey
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionTypeValue = aa[0].collectionTypeValue
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].estimateRebate = aa[0].estimateRebate
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].brandName = aa[0].brandName
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].brandSid = aa[0].brandSid
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].uploadMoney = aa[0].uploadMoney
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].adjustmentMoney = aa[0].adjustmentMoney
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[k].collectionRebateSids = aa[0].collectionRebateSids
// 先将数据清空
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails = []
this.formobj.scmLastCollectionrebateCheckapplydetailDetails = []
this.formobj.scmCollectionrebateCheckapplydetailVos = []
var list = JSON.parse(JSON.stringify(val))
// 同一数据源
list.forEach((e) => {
this.formobj.scmCollectionrebateCheckapplydetailVos.push(e)
})
// 将同一数据源进行拆分(1.按照返利类型统计 2.按照预提年月统计)
// 按照返利类型统计
list.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].estimateRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].uploadMoney : 0) + parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[i].collectionRebateSids.push(e.sid)
v = 1
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.length; l++) {
if (this.formobj.scmWhenCollectionrebateCheckapplydetailDetails[l].collectionTypeValue === collectionTypeValue) {
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.splice(l, 1)
if (v === 0) {
// 第一次对比没有参照，放入参照物
this.formobj.scmWhenCollectionrebateCheckapplydetailDetails.push({
rebateTypeKey: e.rebateTypeKey,
rebateTypeValue: e.rebateTypeValue,
num: 1,
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
adjustmentMoney: e.adjustmentMoney,
collectionRebateSids: [e.sid],
sid: '',
mainSid: ''
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
for (var l in this.formobj.scmLastCollectionrebateCheckapplydetailDetails) {
if (this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].num) + parseFloat(1)
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].estimateRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].uploadMoney : 0) + parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
this.formobj.scmLastCollectionrebateCheckapplydetailDetails[l].collectionRebateSids.push(s.sid)
k = 1
break
}
}
}
if (k === 0) {
this.formobj.scmLastCollectionrebateCheckapplydetailDetails.push({
withholdingDate: s.withholdingDate,
num: 1,
estimateRebate: s.estimateRebate,
uploadMoney: s.uploadMoney,
adjustmentMoney: s.adjustmentMoney,
collectionRebateSids: [s.sid],
sid: '',
mainSid: ''
})
}
})
},
resetState() {
this.viewState = 1
@ -368,11 +305,7 @@ export default {
req.save(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.$message({ showClose: true, type: 'success', message: resp.msg })
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
@ -397,11 +330,7 @@ export default {
req.submitVehicleApply(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.$message({ showClose: true, type: 'success', message: resp.msg })
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
@ -435,5 +364,15 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
</style>

98
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue
View File

@ -14,44 +14,14 @@
<!--Start 新增修改部分-->
<div class="">
<div class="titwu"><span>{{ formobj.checkApply }}回款返利核对审核申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row class="rowStyle">
<el-col :span="2" class="tleftb colOneStyle">
<span>品牌:</span>
</el-col>
<el-col :span="20" class="colOneStyle">
<el-form-item>
<span>{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-table :key="tableKey" :data="formobj.scmWhenCollectionrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="回款方式" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="estimateRebate" label="预提返利" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
@ -59,45 +29,22 @@
</el-table-column>
</el-table>
<el-row>
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="22">
<el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>预提返利本月核对情况</div>
</div>
<div class="title">预提返利本月核对情况</div>
<el-table :key="lastVehrebateKey" :data="formobj.scmLastCollectionrebateCheckapplydetailDetails" border style="width: 100%">
<el-table-column label="预提年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="withholdingDate" label="预提年月" align="center" />
<el-table-column prop="num" label="预提数量" align="center" />
<el-table-column prop="estimateRebate" label="预提金额" align="center" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
<el-table-column label="明细" align="center">
<template slot-scope="scope">
<span>{{ scope.row.notUploadedCost }}</span>
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -234,12 +181,11 @@ export default {
text-align: center;
padding: 30px 0 20px 0;
}
.rowStyle {
border-left: 0px;
.span-sty {
width: 130px !important;
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
.addinputInfo {
margin-left: 120px !important;
}
</style>

125
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue
View File

@ -13,71 +13,30 @@
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="">
<el-form ref="form_obj" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column fixed label="序号" type="index" :index="index + 1" align="center" width="80px"/>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -97,8 +56,8 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
collectionTypeValue: '',
sids: [],
scmCollectionrebateCheckapplydetailVos: [],
// 表单数据
list: [],
rules: {},
@ -114,26 +73,24 @@ export default {
this.sids = aa
console.log('sids', this.sids)
},
showInfo(row) {
showInfo(row, value) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '回款返利核对审核申请明细'
this.collectionTypeValue = row.collectionTypeValue
console.log('编辑回显', row)
req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
this.list = resp.data
req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
this.scmCollectionrebateCheckapplydetailVos = value
}
}).catch((e) => {
this.list = []
})
},
handleDelete() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
for (var i = 0; i < this.list.length; i++) {
@ -143,25 +100,17 @@ export default {
}
}
}
for (var l = 0; l < this.scmCollectionrebateCheckapplydetailVos.length; l++) {
for (var p = 0; p < this.sids.length; p++) {
if (this.scmCollectionrebateCheckapplydetailVos[l].sid === this.sids[p]) {
this.scmCollectionrebateCheckapplydetailVos.splice(l, 1)
}
}
}
},
// 返回（===既判断）
handleReturn() {
// 表单数据
const data_list = []
for (var i = 0; i < this.list.length; i++) {
data_list.push({
sid: this.list[i].sid,
collectionTypeValue: this.list[i].collectionTypeValue,
collectionTypeKey: this.list[i].collectionTypeKey,
collectionMoney: this.list[i].collectionMoney,
estimateRebate: this.list[i].estimateRebate,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid,
uploadMoney: this.list[i].uploadMoney,
adjustmentMoney: this.list[i].adjustmentMoney
})
}
this.$emit('backAdd', data_list, this.collectionTypeValue)
this.$emit('backAdd', this.scmCollectionrebateCheckapplydetailVos)
}
}
}

88
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue
View File

@ -12,70 +12,29 @@
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="">
<el-form ref="form_obj" class="formadd">
<el-table :key="tableKey" :data="list" :index="index" border style="width: 100%">
<el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</el-form>
</div>
@ -95,7 +54,6 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
sids: [],
// 表单数据
list: [],
rules: {},
@ -109,8 +67,10 @@ export default {
})
this.viewTitle = '回款返利核对审核申请明细'
console.log('编辑回显', row)
req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
this.list = resp.data
req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
}
}).catch((e) => {
this.list = []
})

159
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue
View File

@ -2,75 +2,34 @@
<div class="app-container">
<!-- Start 列表页面 -->
<div>
<button-bar view-title="待核对回款返利列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<button-bar view-title="已上传待核对回款返利明细" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="">
<div class="listtop">
<div class="tit">待核对回款返利列表</div>
<div class="tit">已上传待核对回款返利列表</div>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="回款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="厂家收款账号" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.manufaBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="回款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="回款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.calculationStandard }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.withholdingDate.substring(0, scope.row.withholdingDate.length - 9) }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="120" />
<el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
<el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
<el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />
<el-table-column prop="collectionDate" label="回款日期" align="center" width="120" />
<el-table-column prop="freight" label="运费" align="center" width="130" />
<el-table-column prop="topAmount" label="上装金额" align="center" width="130" />
<el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
<el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
<el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
<el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
<el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
<el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<div class="pages">
@ -118,12 +77,10 @@ export default {
tableKey: 0,
list: [],
sids: [],
sids_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
brandSid: '',
createOrgSid: '',
sidList: []
},
@ -171,40 +128,7 @@ export default {
return pageindex
},
handleSelectionChange(row) {
var dateTime = ''
let date = new Date()
let year = date.getFullYear() // 年
let month = date.getMonth() + 1 // 月
dateTime = year + '年' + month + '月'
const aa = []
const bb = []
row.forEach((element) => {
if (element.withholdingDateCopy === dateTime) {
aa.push({
sid: element.sid,
collectionTypeValue: element.collectionTypeValue,
collectionTypeKey: element.collectionTypeKey,
collectionMoney: element.collectionMoney,
estimateRebate: element.estimateRebate,
brandName: element.brandName,
brandSid: element.brandSid,
uploadMoney: element.uploadMoney,
adjustmentMoney: element.adjustmentMoney
})
} else {
bb.push({
sid: element.sid,
withholdingDate: element.withholdingDateCopy,
collectionMoney: element.collectionMoney,
estimateRebate: element.estimateRebate,
uploadMoney: element.uploadMoney,
adjustmentMoney: element.adjustmentMoney
})
}
})
this.sids = aa
this.sids_list = bb
console.log('sids', this.sids, bb, 99999999)
this.sids = row
},
// 查询列表信息
getList() {
@ -212,7 +136,7 @@ export default {
req.checkApplyGetAlreadyUploadCollectionRebate(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@ -221,9 +145,8 @@ export default {
}
})
},
showData(value, val, createOrgSid, brandSid) {
showData(value, createOrgSid) {
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.params.brandSid = brandSid
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
@ -232,26 +155,7 @@ export default {
}
}
}
const bb = []
if (val.length > 0) {
for (var k = 0; k < val.length; k++) {
for (var l = 0; l < val[k].collectionRebateSids.length; l++) {
bb.push(val[k].collectionRebateSids[l])
}
}
}
if (aa.length > 0 && bb.length > 0) {
this.listQuery.params.sidList = aa
for (var p = 0; p < bb.length; p++) {
this.listQuery.params.sidList.push(bb[p])
}
} else if (aa.length > 0 && bb.length === 0) {
this.listQuery.params.sidList = aa
} else if (aa.length === 0 && bb.length > 0) {
this.listQuery.params.sidList = bb
} else if (aa.length === 0 && bb.length === 0) {
this.listQuery.params.sidList = []
}
this.listQuery.params.sidList = aa
this.getList()
},
// 查询按钮
@ -273,15 +177,10 @@ export default {
this.getList()
},
doConfirm() {
if (this.sids.length > 0 || this.sids_list.length > 0) {
this.$emit('backData', this.sids, this.sids_list)
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请选择至少一条记录!',
type: 'error',
duration: 2000
})
this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
}
},
doClose() {

Write Preview
Loading…
Cancel
Save