Browse Source

完善专项返利核对

master
yunuo970428 8 months ago
parent
commit
6a173fb2d2
  1. 20
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
  2. 18
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue
  3. 152
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
  4. 7
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/daifeipeizhuanxiang.vue
  5. 26
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
  6. 7
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue
  7. 18
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue

20
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@ -10,6 +10,26 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
// 一次导出
excelListOne: function(data) {
return request({
url: '/scm/v1/scmspecialrebate/excelListOne',
method: 'post',
data: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
},
// 二次导出
excelListTwo: function(data) {
return request({
url: '/scm/v1/scmspecialrebate/excelListTwo',
method: 'post',
data: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
},
// 单车返利核对(待核对)列表保存修改记录
updateDate: function(data) {
return request({

18
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue

@ -2,7 +2,7 @@
<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="searchcon">-->
<!-- <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>-->
@ -80,6 +80,16 @@
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="二次上传日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.secondaryUploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="二次上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.secondaryUploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确定金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.stayDetermineMoney }}</span>
@ -211,7 +221,7 @@ export default {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1
}
dateTime = date.year + '年' + (date.month >= 10 ? date.month : '0' + date.month) + '月'
dateTime = date.year + '年' + date.month + '月'
const aa = []
const bb = []
row.forEach((element) => {
@ -223,7 +233,7 @@ export default {
withRebate: element.estimateRebate,
brandName: element.brandName,
brandSid: element.brandSid,
uploadMoney: element.uploadMoney,
uploadMoney: parseFloat(element.uploadMoney !== '' ? element.uploadMoney : 0) + parseFloat(element.secondaryUploadMoney !== '' ? element.secondaryUploadMoney : 0),
stayDetermineMoney: element.stayDetermineMoney,
adjustmentMoney: element.adjustmentMoney,
money: element.money
@ -233,7 +243,7 @@ export default {
sid: element.sid,
withholdingDate: element.withholdingDateCopy,
withRebate: element.estimateRebate,
uploadMoney: element.uploadMoney,
uploadMoney: parseFloat(element.uploadMoney !== '' ? element.uploadMoney : 0) + parseFloat(element.secondaryUploadMoney !== '' ? element.secondaryUploadMoney : 0),
stayDetermineMoney: element.stayDetermineMoney,
adjustmentMoney: element.adjustmentMoney,
money: element.money

152
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@ -45,8 +45,10 @@
<div class="listtop">
<div class="tit">待核对专项返利列表</div>
<div>
<el-button size="mini" type="success">导入</el-button>
<el-button size="mini" type="success">导出</el-button>
<el-button size="mini" type="success" @click="exportByFirst">一次导出</el-button>
<el-button size="mini" type="success" @click="importByFirst">一次导入</el-button>
<el-button size="mini" type="success" @click="exportBySecond">二次导出</el-button>
<el-button size="mini" type="success" @click="importBySecond">二次导入</el-button>
</div>
</div>
<div class="">
@ -60,7 +62,7 @@
</el-table-column>
<el-table-column label="调整状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadState == '0' ? '未调整' : scope.row.uploadState == '1' ? '已调整' : ''}}</span>
<span>{{ scope.row.adjustmentState == '0' ? '待确认' : scope.row.adjustmentState == '1' ? '确认调整' : scope.row.adjustmentState == '2' ? '暂不调整' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" width="200">
@ -137,8 +139,8 @@
</el-table-column>
<el-table-column label="操作" align="center" width="180px">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.adjustmentState == '0'" size="mini" @click="toSave(scope.row)">保存</el-button>
<el-button type="primary" v-if="scope.row.isAdjustment == '否' || (scope.row.uploadState == '3' && scope.row.adjustmentState == '0')" size="mini" @click="toAdjust(scope.row)">调整</el-button>
<el-button type="primary" v-if="scope.row.adjustmentState == '0' || scope.row.adjustmentState == '2'" size="mini" @click="toSave(scope.row)">保存</el-button>
<el-button type="primary" v-if="scope.row.adjustmentState == '2'" size="mini" @click="toAdjust(scope.row)">调整</el-button>
</template>
</el-table-column>
</el-table>
@ -244,6 +246,41 @@
</el-form>
</div>
</el-dialog>
<!-- 导入导出 -->
<el-dialog :visible.sync="dialogFileVisible" width="70%" :show-close="false">
<el-card class="box-card">
<div>
<el-upload
ref="upload"
class="upload-demo"
accept=".xls"
name="file"
:action="updateAction"
:on-success="handleSuccess"
:on-remove="handleRemove"
:file-list="fileList"
:auto-upload="false"
:multiple="false"
:limit="1"
:data="uploadData"
:headers="headers"
>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传</el-button>
</el-upload>
</div>
<div>
<h3>文件上传结果</h3>
<el-card class="box-card">
<div>{{ uploadResultMesssage }}</div>
</el-card>
</div>
</el-card>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
<el-button size="small" @click="dialogFileVisible = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
@ -355,6 +392,18 @@ export default {
secondRebate: '',
adjustmentMoney: '',
cost: ''
},
dialogFileVisible: false,
updateAction: '',
fileList: [],
uploadResultMesssage: '',
uploadData: {
sid: '',
userSid: '',
orgPath: ''
},
headers: {
token: window.sessionStorage.getItem('token')
}
}
},
@ -399,9 +448,6 @@ export default {
case 'toAdd':
this.toAdd()
break
case 'doImport':
this.doImport()
break
case 'doClose':
this.doClose()
break
@ -631,6 +677,96 @@ export default {
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
exportByFirst() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.excelListOne(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '一次导入模版' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
importByFirst() {
this.dialogFileVisible = true
this.updateAction = process.env.VUE_APP_BASE_API + '/scm/v1/scmspecialrebate/getExcelOneInfo'
this.fileList = []
this.uploadResultMesssage = ''
},
exportBySecond() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.excelListTwo(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '二次导入模版' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
importBySecond() {
this.dialogFileVisible = true
this.updateAction = process.env.VUE_APP_BASE_API + '/scm/v1/scmspecialrebate/getExcelTwoInfo'
this.fileList = []
this.uploadResultMesssage = ''
},
handleRemove() {
this.uploadResultMesssage = ''
},
submitUpload() {
this.uploadData.userSid = window.sessionStorage.getItem('userSid')
this.uploadData.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.$refs.upload.submit()
},
handleSuccess(resp, file, fileList) {
const _this = this
if (resp.success) {
_this.uploadResultMesssage = resp.msg
} else {
_this.uploadResultMesssage = resp.msg
}
},
handleConfirm() {
if (this.uploadResultMesssage === '') {
this.$message({ showClose: true, type: 'error', message: '请先上传单车返利模版' })
return
} else {
this.dialogFileVisible = false
this.updateAction = ''
this.uploadData.userSid = ''
this.uploadData.orgPath = ''
this.getList()
}
}
}
}

7
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/relation/daifeipeizhuanxiang.vue

@ -35,11 +35,6 @@
<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.state === '3' ? '已上传' : ''}}</span>
</template>
</el-table-column>
<el-table-column label="分配数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.disNum }}</span>
@ -154,6 +149,7 @@ export default {
state: '',
createEndTime: '',
createStartTime: '',
isPage: '0',
sidList: []
},
current: 1,
@ -265,6 +261,7 @@ export default {
this.listQuery.params.createEndTime = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.state = ''
this.listQuery.params.isPage = '0'
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5

26
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue

@ -30,11 +30,6 @@
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</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>
@ -53,11 +48,6 @@
<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.state === '3' ? '已上传' : ''}}</span>
</template>
</el-table-column>
<el-table-column label="分配数量" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.disNum }}</span>
@ -149,16 +139,6 @@ export default {
sids: [],
brand_list: [],
rebateType_list: [],
state_list: [
{
dictKey: 1,
dictValue: '未上传'
},
{
dictKey: 3,
dictValue: '已上传'
}
],
listLoading: false,
listQuery: {
params: {
@ -173,7 +153,8 @@ export default {
sidList: [],
orgPath: '',
userSid: '',
menuUrl: ''
menuUrl: '',
isPage: '1'
},
current: 1,
size: 5,
@ -283,7 +264,8 @@ export default {
sidList: [],
orgPath: '',
userSid: '',
menuUrl: ''
menuUrl: '',
isPage: '1'
},
current: 1,
size: 5,

7
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue

@ -35,11 +35,6 @@
<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.state === '3' ? '已上传' : ''}}</span>
</template>
</el-table-column>
<el-table-column label="分配数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.disNum }}</span>
@ -154,6 +149,7 @@ export default {
state: '',
createEndTime: '',
createStartTime: '',
isPage: '0',
sidList: []
},
current: 1,
@ -265,6 +261,7 @@ export default {
this.listQuery.params.createEndTime = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.state = ''
this.listQuery.params.isPage = '0'
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5

18
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue

@ -2,7 +2,7 @@
<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="">
<!-- <div class="searchcon">-->
<!-- <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>-->
@ -80,6 +80,16 @@
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="二次上传日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.secondaryUploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="二次上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.secondaryUploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确定金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.stayDetermineMoney }}</span>
@ -211,7 +221,7 @@ export default {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1
}
dateTime = date.year + '年' + (date.month >= 10 ? date.month : '0' + date.month) + '月'
dateTime = date.year + '年' + date.month + '月'
const aa = []
const bb = []
row.forEach((element) => {
@ -223,7 +233,7 @@ export default {
withRebate: element.estimateRebate,
brandName: element.brandName,
brandSid: element.brandSid,
uploadMoney: element.uploadMoney,
uploadMoney: parseFloat(element.uploadMoney !== '' ? element.uploadMoney : 0) + parseFloat(element.secondaryUploadMoney !== '' ? element.secondaryUploadMoney : 0),
stayDetermineMoney: element.stayDetermineMoney,
adjustmentMoney: element.adjustmentMoney,
money: element.money
@ -233,7 +243,7 @@ export default {
sid: element.sid,
withholdingDate: element.withholdingDateCopy,
withRebate: element.estimateRebate,
uploadMoney: element.uploadMoney,
uploadMoney: parseFloat(element.uploadMoney !== '' ? element.uploadMoney : 0) + parseFloat(element.secondaryUploadMoney !== '' ? element.secondaryUploadMoney : 0),
stayDetermineMoney: element.stayDetermineMoney,
adjustmentMoney: element.adjustmentMoney,
money: element.money

Loading…
Cancel
Save