Browse Source

单车返利核对

master
yunuo970428 3 years ago
parent
commit
eae231d595
  1. 81
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
  2. 82
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue
  3. 413
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  4. 88
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
  5. 413
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  6. 166
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue
  7. 35
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue

81
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@ -0,0 +1,81 @@
import request from '@/utils/request'
export default {
// 单车返利核对(待核对)查询分页列表
listPage: function(data) {
return request({
url: '/scm/v1/scmvehrebate/checkApplyGetVehRebate',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 单车返利核对(待核对)列表保存修改记录
updateDate: function(data) {
return request({
url: '/scm/v1/scmvehrebate/update',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 单车返利核对(待核对)列表调整修改记录
adjustment: function(data) {
return request({
url: '/scm/v1/scmvehrebate/adjustment',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 单车返利核对申请--点击添加--选择已核对单车返利信息
checkApplyGetAlreadyUploadVehRebate: function(data) {
return request({
url: '/scm/v1/scmvehrebate/checkApplyGetAlreadyUploadVehRebate',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 核对审核申请分页列表
pagelist: function(data) {
return request({
url: '/scm/v1/scmvehrebatecheckapply/listPage',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 删除
delete: function(params) {
return request({
url: '/scm/v1/scmvehrebate/delBySids',
method: 'DELETE',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 通过sid查询一条记录
fetchDetailsBySid: function(data) {
return request({
url: '/scm/v1/scmvehrebatecheckapply/fetchDetailsBySid/' + data,
method: 'get'
})
},
// 单车返利核对审核申请保存
save: function(data) {
return request({
url: '/scm/v1/scmvehrebatecheckapply/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 查看明细
vehRebateWithDetails: function(data) {
return request({
url: '/scm/v1/scmvehrebatewith/vehRebateWithDetails/' + data,
method: 'get'
})
},
}

82
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue

@ -13,7 +13,12 @@
<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.mainSid" placeholder="请输入车架号" clearable/>
<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>
<el-form-item label="申请标题">
<el-input v-model="listQuery.params.checkApply" 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="选择日期"/>
@ -48,32 +53,52 @@
</el-table-column>
<el-table-column label="分公司" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
<span>{{ scope.row.createOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="预提申请" align="center" width="200">
<el-table-column label="申请标题" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.applyPeoName }}</span>
<span>{{ scope.row.checkApply }}</span>
</template>
</el-table-column>
<el-table-column label="预提返利" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
<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.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.money }}</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.applyTitle }}</span>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.createByName }}</span>
</template>
</el-table-column>
</el-table>
@ -84,21 +109,25 @@
</div>
</div>
</div>
<bicyclerebatecheckAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
</div>
</template>
<script>
import req from '@/api/othermenu/shangzhuangtiaojia'
import req from '@/api/bikerebate/bicyclerebatecheck'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
export default {
name: 'bicyclerebatecheck',
components: {
Pagination,
pageye,
ButtonBar
ButtonBar,
bicyclerebatecheckAdd
},
data() {
return {
@ -128,9 +157,12 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
brand_list: '',
listQuery: {
params: {
createBySid: '',
brandSid: '',
checkApply: '',
createOrgSid: '',
createEndTime: '',
createStartTime: ''
},
@ -143,12 +175,25 @@ export default {
},
created() {
//
this.getList()
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).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()
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -188,8 +233,7 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
req.listPage(this.listQuery).then((response) => {
req.pagelist(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
@ -209,7 +253,9 @@ export default {
handleReset() {
this.listQuery = {
params: {
createBySid: '',
brandSid: '',
checkApply: '',
createOrgSid: '',
createEndTime: '',
createStartTime: ''
},
@ -222,12 +268,8 @@ export default {
handleClick() {
this.$parent.resetState()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
},
toEdit(row) {
this.viewState = 3
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {

413
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@ -15,57 +15,61 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>单车返利核对审核申请</span></div>
<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="24" class="tleftb colOneStyle">
<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>
</el-row>
<div class="title">
<div>本月各项返利核对情况</div>
</div>
<el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%">
<el-table :key="tableKey" :data="formobj.scmWhenVehrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index)">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.jacketName }}</span>
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column label="预提金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确认金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
@ -74,67 +78,67 @@
</template>
</el-table-column>
</el-table>
<div class="title">
<div class="divStyle">
<div>预提返利本月核对情况</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="handleCheck">往月核对情况</el-button>
</div>
<el-table :key="baseVehinstallModpriceKey" :data="formobj.baseVehinstallModprice" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table :key="lastVehrebateKey" :data="formobj.scmLastVehrebateCheckapplydetailDetails" border style="width: 100%">
<el-table-column label="预提年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.jacketName }}</span>
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column label="预提数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.withholdingAmount }}</span>
</template>
</el-table-column>
<el-table-column label="预提金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadAmount }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确认金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="未上传数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.notUploadedAmount }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.notUploadedCost }}</span>
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="4">
<el-col :span="2" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="20">
<el-col :span="22">
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable></el-input></el-form-item>
</el-col>
</el-row>
@ -143,13 +147,53 @@
</div>
<!--End 添加修改部分-->
<yiheduidanchefanli v-show="viewState == 2" ref="divSelect" @backData="backData" @doback="resetState"/>
<bicyclerebatetobecheckedAdd v-show="viewState == 3" ref="divAdd" @doback="resetState"/>
<bicyclerebatetobecheckedAdd v-show="viewState == 3" ref="divAdd" @backAdd="backAdd" @doback="resetState"/>
<el-dialog :visible.sync="dialogVisible" width="60%">
<div class="titwu"><span>往月核对情况</span></div>
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb">
<span>月促政策</span>
</el-col>
<el-col :span="21">
<el-form-item><span>{{ summation }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="checkKey" :data="checkList" border width="100%">
<el-table-column label="计提月份" align="center">
<template slot-scope="scope">
<span>{{ scope.row.month }}</span>
</template>
</el-table-column>
<el-table-column label="计提" align="center">
<template slot-scope="scope">
<span>{{ scope.row.month }}</span>
</template>
</el-table-column>
<el-table-column label="上传" align="center">
<template slot-scope="scope">
<span>{{ scope.row.month }}</span>
</template>
</el-table-column>
<el-table-column label="未上传" align="center">
<template slot-scope="scope">
<span>{{ scope.row.month }}</span>
</template>
</el-table-column>
<el-table-column label="调整" align="center">
<template slot-scope="scope">
<span>{{ scope.row.month }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/othermenu/shangzhuangtiaojia'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
import req from '@/api/bikerebate/bicyclerebatecheck'
import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
import yiheduidanchefanli from './relation/yiheduidanchefanli'
import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
@ -162,119 +206,274 @@ export default {
data() {
return {
viewTitle: '',
viewState: 1,
index: 0,
tableKey: 0,
baseVehinstallModpriceKey: 1,
viewState: 1,
lastVehrebateKey: 1,
checkKey: 2,
dialogVisible: false,
summation: '',
checkList: [],
dialogStatus: '',
brand_list: [],
//
formobj: {
applyPeoName: '',
applyTitle: '',
createBySid: '',
sid: '',
createByName: '',
brandName: '',
brandSid: '',
checkApply: '',
createOrgName: '',
createOrgSid: '',
modpriceReason: '',
nodeState: '',
sid: '',
useOrgName: '',
useOrgSid: '',
baseVehinstallModpricedetails: []
remarks: '',
instanceId: '', // ID
taskId: '', // ID
scmWhenVehrebateCheckapplydetailDetails: [],
scmLastVehrebateCheckapplydetailDetails: []
},
rules: {},
submitdisabled: false
}
},
methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
let day = date.getDate() //
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
this.formobj.createTime = year + '-' + month + '-' + day
this.formobj.checkApply = year + '年' + month + '月'
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) {
this.formobj.createOrgName = res.data.name
this.formobj.useOrgName = res.data.name
}
})
fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) {
this.formobj.createOrgName = res.data.name
this.formobj.useOrgName = res.data.name
}
})
brandDown({ useOrg: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
},
showAdd() {
this.init()
this.newDate()
showAdd(createOrgSid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
this.init()
this.newDate()
})
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.applyPeoName = window.sessionStorage.getItem('name')
this.viewTitle = '【新增】单车返利预提申请'
this.dialogStatus = 'add'
this.formobj.createOrgSid = createOrgSid
this.formobj.useOrgSid = createOrgSid
this.formobj.createByName = window.sessionStorage.getItem('name')
this.viewTitle = '【新增】单车返利核对审核申请'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】单车返利预提申请'
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】单车返利核对审核申请'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
req.fetchDetailsBySid(row.sid).then((resp) => {
this.formobj = resp.data
}).catch((e) => {
this.formobj = row
})
},
changeBrand(value) {
let bb = null
this.brand_list.forEach((e) => {
if (e.brandName === value) {
bb = {
name: e.brandName,
sid: e.sid
}
}
})
this.formobj.brandSid = bb.sid
},
//
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.baseVehinstallModpricedetails)
this.$refs['divSelect'].showData(this.formobj.scmWhenVehrebateCheckapplydetailDetails, this.formobj.scmLastVehrebateCheckapplydetailDetails, this.formobj.createOrgSid, this.formobj.brandSid)
},
backData(value) {
backData(value, val) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseVehinstallModpricedetails.push({
adjustVehGuidedPrice: '',
costPrice: e.costPrice,
guidedPrice: e.guidedPrice,
incOrDecInPrice: '',
jacketName: e.jacketName,
jacketSid: e.jacketSid,
mainSid: '',
modelName: e.modelName,
modelSid: e.modelSid,
sid: '',
vehGuidedPrice: '',
vinNo: e.vinNo,
remarks: ''
})
})
for (var i in value) {
let cval = value[i]
if (!this.formobj.scmWhenVehrebateCheckapplydetailDetails || this.formobj.scmWhenVehrebateCheckapplydetailDetails.length === 0) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails = []
}
let v = 0
for (var j in this.formobj.scmWhenVehrebateCheckapplydetailDetails) {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].rebateTypeValue === cval.rebateTypeValue) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].num = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].num) + parseInt(1)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].withRebate) + parseInt(cval.withRebate)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].uploadMoney) + parseInt(cval.uploadMoney)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].stayDetermineMoney) + parseInt(cval.stayDetermineMoney)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money = parseInt(this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].money) + parseInt(cval.money)
this.formobj.scmWhenVehrebateCheckapplydetailDetails[j].vehRebateSids.push(cval.sid)
v = 1
break
}
}
if (v === 0) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({
rebateTypeKey: cval.rebateTypeKey,
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
uploadMoney: cval.uploadMoney,
stayDetermineMoney: cval.stayDetermineMoney,
adjustmentMoney: cval.adjustmentMoney,
money: cval.money,
vehRebateSids: [cval.sid],
sid: '',
mainSid: ''
})
}
}
} else {
this.formobj.scmWhenVehrebateCheckapplydetailDetails = []
}
if (val.length > 0) {
for (var p in val) {
let bval = val[p]
if (!this.formobj.scmLastVehrebateCheckapplydetailDetails || this.formobj.scmLastVehrebateCheckapplydetailDetails.length === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails = []
}
let v = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].palceGenDate === bval.palceGenDate) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingAmount) + parseInt(1)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadAmount) + parseInt(1)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate) + parseInt(bval.withRebate)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney) + parseInt(bval.uploadMoney)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney) + parseInt(bval.stayDetermineMoney)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney) + parseInt(bval.adjustmentMoney)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = parseInt(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money) + parseInt(bval.money)
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(bval.sid)
v = 1
break
}
}
if (v === 0) {
this.formobj.scmLastVehrebateCheckapplydetailDetails.push({
palceGenDate: bval.palceGenDate,
withholdingAmount: 1,
uploadAmount: 1,
withRebate: bval.withRebate,
uploadMoney: bval.uploadMoney,
stayDetermineMoney: bval.stayDetermineMoney,
adjustmentMoney: bval.adjustmentMoney,
money: bval.money,
notUploadedAmount: '',
notUploadedCost: '',
vehRebateSids: [bval.sid],
sid: '',
mainSid: ''
})
}
}
} else {
this.formobj.scmLastVehrebateCheckapplydetailDetails = []
}
},
//
dataDelete(index) {
this.formobj.baseVehinstallModpricedetails.splice(index, 1)
},
handleLook(row) {},
handleLook(row) {
this.viewState = 3
this.$refs['divAdd'].showInfo(row)
},
backAdd(value, rebateType) {
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].rebateTypeValue === cval.rebateTypeValue) {
aa[j].num = parseInt(aa[j].num) + parseInt(1)
aa[j].withRebate = parseInt(aa[j].withRebate) + parseInt(cval.withRebate)
aa[j].uploadMoney = parseInt(aa[j].uploadMoney) + parseInt(cval.uploadMoney)
aa[j].stayDetermineMoney = parseInt(aa[j].stayDetermineMoney) + parseInt(cval.stayDetermineMoney)
aa[j].adjustmentMoney = parseInt(aa[j].adjustmentMoney) + parseInt(cval.adjustmentMoney)
aa[j].money = parseInt(aa[j].money) + parseInt(cval.money)
aa[j].vehRebateSids.push(cval.sid)
v = 1
break
}
}
if (v === 0) {
aa.push({
rebateTypeKey: cval.rebateTypeKey,
rebateTypeValue: cval.rebateTypeValue,
num: 1,
withRebate: cval.withRebate,
brandName: cval.brandName,
brandSid: cval.brandSid,
uploadMoney: cval.uploadMoney,
stayDetermineMoney: cval.stayDetermineMoney,
adjustmentMoney: cval.adjustmentMoney,
money: cval.money,
vehRebateSids: [cval.sid],
sid: '',
mainSid: ''
})
}
}
for (var k = 0; k < this.formobj.scmWhenVehrebateCheckapplydetailDetails.length; k++) {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].rebateTypeValue === rebateType) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].rebateTypeKey = aa[0].rebateTypeKey
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].rebateTypeValue = aa[0].rebateTypeValue
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].num = aa[0].num
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].withRebate = aa[0].withRebate
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].brandName = aa[0].brandName
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].brandSid = aa[0].brandSid
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].uploadMoney = aa[0].uploadMoney
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].stayDetermineMoney = aa[0].stayDetermineMoney
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].adjustmentMoney = aa[0].adjustmentMoney
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].money = aa[0].money
this.formobj.scmWhenVehrebateCheckapplydetailDetails[k].vehRebateSids = aa[0].vehRebateSids
break
}
}
} else if (value.length === 0) {
for (var l = 0; l < this.formobj.scmWhenVehrebateCheckapplydetailDetails.length; l++) {
if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[l].rebateTypeValue === rebateType) {
this.formobj.scmWhenVehrebateCheckapplydetailDetails.splice(l, 1)
break
}
}
}
},
resetState() {
this.viewState = 1
},
handleCheck() {
this.dialogVisible = true
},
save() {
console.log(this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
req.save(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
@ -297,17 +496,20 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
//
this.formobj = {
applyPeoName: '',
applyTitle: '',
createBySid: '',
sid: '',
createByName: '',
brandName: '',
brandSid: '',
checkApply: '',
createOrgName: '',
createOrgSid: '',
modpriceReason: '',
nodeState: '',
sid: '',
useOrgName: '',
useOrgSid: '',
baseVehinstallModpricedetails: []
remarks: '',
instanceId: '', // ID
taskId: '', // ID
scmWhenVehrebateCheckapplydetailDetails: [],
scmLastVehrebateCheckapplydetailDetails: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
@ -316,6 +518,23 @@ export default {
}
</script>
<style scoped>
.divStyle {
padding: 7px;
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
color: #ffffff;
text-align: left;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.titwu {
font-size: 28px;
text-align: center;
padding: 30px 0 20px 0;
}
.rowStyle {
border-left: 0px;
}

88
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue

@ -22,37 +22,37 @@
<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.jacketName }}</span>
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column label="预提金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确认金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="明细" align="center">
@ -68,52 +68,52 @@
<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.jacketName }}</span>
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column label="预提数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.withholdingAmount }}</span>
</template>
</el-table-column>
<el-table-column label="预提金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
<span>{{ scope.row.withRebate }}</span>
</template>
</el-table-column>
<el-table-column label="上传数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadAmount }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确认金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="未上传数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.notUploadedAmount }}</span>
</template>
</el-table-column>
<el-table-column label="未上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.notUploadedCost }}</span>
</template>
</el-table-column>
</el-table>
@ -135,7 +135,6 @@
<script>
import req from '@/api/othermenu/shangzhuangtiaojia'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
export default {
@ -152,43 +151,17 @@ export default {
baseVehinstallModpriceKey: 1,
viewState: 1,
//
formobj: {
applyPeoName: '',
applyTitle: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
modpriceReason: '',
nodeState: '',
sid: '',
useOrgName: '',
useOrgSid: '',
baseVehinstallModpricedetails: []
},
formobj: {},
rules: {},
submitdisabled: false
}
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) {
this.formobj.createOrgName = res.data.name
this.formobj.useOrgName = res.data.name
}
})
}
})
},
showEdit(row) {
showInfo(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】单车返利预提申请'
this.viewTitle = '单车返利核对审核申请详情'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
this.formobj = resp.data
@ -200,19 +173,7 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
//
this.formobj = {
applyPeoName: '',
applyTitle: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
modpriceReason: '',
nodeState: '',
sid: '',
useOrgName: '',
useOrgSid: '',
baseVehinstallModpricedetails: []
}
this.formobj = {}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
@ -220,12 +181,5 @@ export default {
}
</script>
<style scoped>
.rowStyle {
border-left: 0px;
}
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

413
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@ -13,10 +13,12 @@
<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.mainSid" placeholder="请输入车架号" clearable/>
<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>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
<el-input v-model="listQuery.params.vinNo" 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="选择日期"/>
@ -24,14 +26,18 @@
<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-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
<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.mainSid" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="上传状态">
<el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
<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>
@ -52,118 +58,111 @@
<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.nodeState }}</span>
<span>{{ scope.row.uploadState === '0' ? '未调整' : scope.row.uploadState === '1' ? '已调整' : scope.row.uploadState === '2' ? '未上传' : scope.row.uploadState === '3' ? '已上传' : ''}}</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.applyPeoName }}</span>
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家结算价" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.applyTitle }}</span>
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="计算标准" align="center" width="100">
<el-table-column label="返利类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
</template>
</el-table-column>
<el-table-column label="预提日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center" width="120">
<el-table-column label="上传日期" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<el-date-picker v-model="scope.row.uploadDate" type="date" style="width: 160px" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<el-input v-model="scope.row.uploadMoney" clearable placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column label="二次上传日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.secondaryUploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="二次上传金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<span>{{ scope.row.secondaryUploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确定金额" align="center" width="120">
<el-table-column label="待确定金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<el-input v-model="scope.row.stayDetermineMoney" clearable placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column label="费用" align="center" width="120">
<el-table-column label="费用" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<el-input v-model="scope.row.money" clearable placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column label="是否调整" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<template slot-scope="scope"><!--@change="changeIsAdjustment(scope.row)" -->
<el-select v-model="scope.row.isAdjustment" @change="changeIsAdjustment(scope.row)" placeholder="" filterable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center" width="100">
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<el-input :disabled="scope.row.isAdjustment === '' || scope.row.isAdjustment === '否'" v-model="scope.row.adjustmentMoney" clearable placeholder=""></el-input>
<!-- <span>{{ scope.row.adjustmentMoney }}</span>-->
</template>
</el-table-column>
<el-table-column label="调整说明" align="center" width="120">
<el-table-column label="调整说明" align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.modpriceReason }}</span>
<el-input :disabled="scope.row.isAdjustment === '' || scope.row.isAdjustment === '否'" v-model="scope.row.adjustmentRemarks" clearable placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180px" >
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">保存</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">调整</el-button>
<el-button type="primary" size="mini" @click="toSave(scope.row)">保存</el-button>
<el-button type="primary" :disabled="scope.row.isAdjustment === '' || scope.row.isAdjustment === '是'" size="mini" @click="toAdjust(scope.row)">调整</el-button>
</template>
</el-table-column>
</el-table>
@ -176,15 +175,106 @@
</div>
<bicyclerebatecheck v-show="viewState == 2" ref="divCheck" @doback="resetState"/>
<bicyclerebatecheckAdd v-show="viewState == 3" ref="divCheckAdd" @doback="resetState"/>
<el-dialog center :visible.sync="dialogVisible" width="60%">
<div class="app-container">
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<div class="title">
<div><span>待确定金额</span></div>
</div>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="4" class="tleftb">
<span>待确定金额</span>
</el-col>
<el-col :span="4">
<el-form-item><span>{{ formobj.stayDetermineMoney }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>其中含费用</span>
</el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.firstCost" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>其中含返利</span>
</el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.firstRebate" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<div class="title">
<el-checkbox v-model="checked"><span style="color: #FFFFFF">返利二次上传</span></el-checkbox>
</div>
<div v-if="checked">
<el-row>
<el-col :span="4" class="tleftb">
<span>剩余预计返利</span>
</el-col>
<el-col :span="4">
<el-form-item><span>{{ formobj.surplusRebate}}</span></el-form-item>
</el-col>
<el-col :span="4">
</el-col>
<el-col :span="4">
</el-col>
<el-col :span="4" class="tleftb">
<span>二次上传日期</span>
</el-col>
<el-col :span="4">
<el-form-item><el-date-picker v-model="formobj.secondaryUploadDate" type="date" clearable value-format="yyyy-MM-dd" style="width: 100%" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>二次上传金额</span>
</el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.secondaryUploadMoney" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>其中含费用</span>
</el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.secondCost" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>其中含返利</span>
</el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.secondRebate" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>调整金额合计</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ adjustmentMoney() }}</span></el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/othermenu/shangzhuangtiaojia'
import req from '@/api/bikerebate/bicyclerebatecheck'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import bicyclerebatecheck from './bicyclerebatecheck'
import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
import { brandDown, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'bicyclerebatetobechecked',
@ -192,11 +282,12 @@ export default {
Pagination,
ButtonBar,
bicyclerebatecheck,
bicyclerebatecheckAdd
bicyclerebatecheckAdd,
},
data() {
return {
btndisabled: false,
dialogVisible: false,
btnList: [
{
type: 'primary',
@ -209,7 +300,7 @@ export default {
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toAdd',
btnKey: 'toClick',
btnLabel: '调整'
},
{
@ -222,16 +313,51 @@ export default {
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 3,
viewState: 1,
// -----------
tableKey: 0,
list: [],
sids: [],
FormLoading: false,
brand_list: [],
rebateType_list: [],
state_list: [
{
dictKey: 0,
dictValue: '未上传'
},
{
dictKey: 1,
dictValue: '已上传'
},
{
dictKey: 2,
dictValue: '未调整'
},
{
dictKey: 3,
dictValue: '已调整'
}
],
whether_list: [
{
dictKey: 0,
dictValue: '否'
},
{
dictKey: 1,
dictValue: '是'
}
],
listLoading: false,
listQuery: {
params: {
createBySid: '',
brandSid: '',
createOrgSid: '',
vinNo: '',
rebateTypeKey: '',
rebateName: '',
state: '',
createEndTime: '',
createStartTime: ''
},
@ -239,17 +365,50 @@ export default {
size: 5,
total: 0
},
rules: {}
rules: {},
viewTitle: '返利调整',
submitdisabled: false,
checked: false,
formobj: {
sid: '',
stayDetermineMoney: '',
firstCost: '',
firstRebate: '',
surplusRebate: '',
secondaryUploadDate: '',
secondaryUploadMoney: '',
secondCost: '',
secondRebate: '',
adjustmentMoney: ''
}
}
},
created() {
//
this.getList()
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
typeValues({ type: 'rebateType' }).then((res) => {
if (res.success) {
this.rebateType_list = res.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).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()
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -295,7 +454,6 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
@ -316,7 +474,12 @@ export default {
handleReset() {
this.listQuery = {
params: {
createBySid: '',
brandSid: '',
createOrgSid: '',
vinNo: '',
rebateTypeKey: '',
rebateName: '',
state: '',
createEndTime: '',
createStartTime: ''
},
@ -326,21 +489,151 @@ export default {
}
this.getList()
},
changeIsAdjustment(row) {
// if (row.isAdjustment === '') {
// if (row.uploadMoney === '') {
// row.isAdjustment = ''
// this.$message({ showClose: true, type: 'error', message: '' })
// return
// }
// if (row.money === '') {
// row.isAdjustment = ''
// this.$message({ showClose: true, type: 'error', message: '' })
// return
// }
// if (row.stayDetermineMoney === '') {
// row.isAdjustment = ''
// this.$message({ showClose: true, type: 'error', message: '' })
// return
// }
// if (row.uploadMoney !== '' && row.money !== '' && row.stayDetermineMoney !== '') {
// row.adjustmentMoney = parseInt(row.uploadMoney) - parseInt(row.money) - parseInt(row.stayDetermineMoney) - parseInt(row.estimateRebate)
// }
// } else {
// row.adjustmentMoney = 0
// row.adjustmentRemarks = ''
// }
if (row.isAdjustment === '否') {
row.adjustmentMoney = 0
row.adjustmentRemarks = ''
}
},
adjustmentMoney() {
this.formobj.adjustmentMoney = parseInt(this.formobj.firstRebate - 0) + parseInt(this.formobj.secondRebate - 0) - parseInt(this.formobj.surplusRebate - 0)
return this.formobj.adjustmentMoney
},
handleSave() {
let aa = null
if (!this.checked) {
aa = {
sid: this.formobj.sid,
stayDetermineMoney: 0,
cost: this.formobj.firstCost,
secondaryUploadDate: '',
secondaryUploadMoney: 0,
adjustmentMoney: this.formobj.firstRebate
}
} else {
aa = {
sid: this.formobj.sid,
stayDetermineMoney: 0,
cost: parseInt(this.formobj.firstCost) + parseInt(this.formobj.secondCost),
secondaryUploadDate: this.formobj.secondaryUploadDate,
secondaryUploadMoney: this.formobj.secondaryUploadMoney,
adjustmentMoney: this.formobj.adjustmentMoney
}
}
req.adjustment(aa).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
this.handleReturn()
}
})
},
handleReturn() {
this.dialogVisible = false
this.formobj = {
sid: '',
stayDetermineMoney: '',
firstCost: '',
firstRebate: '',
surplusRebate: '',
secondaryUploadDate: '',
secondaryUploadMoney: '',
secondCost: '',
secondRebate: '',
adjustmentMoney: ''
}
this.checked = false
},
handleClick() {
this.viewState = 2
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
this.$refs['divCheckAdd'].showAdd(this.listQuery.params.createOrgSid)
},
toSave(row) {
if (row.stayDetermineMoney === '') {
this.$message({ showClose: true, type: 'error', message: '待确定金额不能为空' })
return
}
if (row.stayDetermineMoney !== '0') {
if (row.isAdjustment === '是') {
this.$message({ showClose: true, type: 'error', message: '因待确定金额大于0,是否调整选项需选择否' })
return
}
} else if (row.stayDetermineMoney === '0') {
if (row.adjustmentMoney.toString().indexOf('-') !== -1) {
if (row.isAdjustment === '是') {
this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额小于0,是否调整选项需选择否' })
return
}
} else if (row.adjustmentMoney !== '0') {
if (row.isAdjustment === '否') {
this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额大于0,是否调整选项需选择是' })
return
}
} else if (row.adjustmentMoney === '0') {
if (row.isAdjustment === '否') {
this.$message({ showClose: true, type: 'error', message: '因待确定金额等于0且调整金额等于0,是否调整选项需选择是' })
return
}
}
}
if (row.isAdjustment === '是') {
if (row.adjustmentMoney === '') {
this.$message({ showClose: true, type: 'error', message: '调整金额不能为空' })
return
}
if (row.adjustmentRemarks === '') {
this.$message({ showClose: true, type: 'error', message: '调整说明不能为空' })
return
}
}
req.updateDate(row).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
}
})
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
toAdjust(row) {
this.dialogVisible = true
this.formobj.stayDetermineMoney = row.stayDetermineMoney
this.formobj.sid = row.sid
this.formobj.firstCost = 0
this.formobj.firstRebate = 0
this.formobj.secondCost = 0
this.formobj.secondRebate = 0
this.formobj.secondaryUploadMoney = 0
this.formobj.surplusRebate = parseInt(row.estimateRebate) - parseInt(row.uploadMoney)
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })

166
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue

@ -7,101 +7,100 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="danger" size="small">删除</el-button>
<el-button type="danger" size="small" @click="handleDelete">删除</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>单车返利待核对申请明细</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :index="index" border style="width: 100%" @selection-change="handleSelectionChange">
<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">
<template slot-scope="scope">
<span>{{ scope.row.jacketName }}</span>
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<el-table-column label="车型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家合同价" align="center">
<el-table-column label="厂家合同价" align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center">
<el-table-column label="其中运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<el-table-column label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<el-table-column label="返利类型" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<el-table-column label="返利名称" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<el-table-column label="预计返利" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center">
<el-table-column label="所属年月" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center">
<el-table-column label="上传日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<el-table-column label="上传金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确定金额" align="center">
<el-table-column label="待确定金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<el-table-column label="费用" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="是否调整" align="center">
<el-table-column label="是否调整" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.isAdjustment }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<el-table-column label="调整金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整说明" align="center">
<el-table-column label="调整说明" align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentRemarks }}</span>
</template>
</el-table-column>
</el-table>
@ -113,8 +112,8 @@
</template>
<script>
import req from '@/api/othermenu/shangzhuangtiaojia'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
import req from '@/api/bikerebate/bicyclerebatecheck'
import list from "@/views/vehicleModel/vehicleModelConfig/list";
export default {
name: 'bicyclerebatetobecheckedAdd',
@ -124,40 +123,15 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
rebateType: '',
sids: [],
//
formobj: {
applyPeoName: '',
applyTitle: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
modpriceReason: '',
nodeState: '',
sid: '',
useOrgName: '',
useOrgSid: '',
baseVehinstallModpricedetails: []
},
list: [],
rules: {},
submitdisabled: false
}
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.createOrgSid).then((res) => {
if (res.success) {
this.formobj.createOrgName = res.data.name
this.formobj.useOrgName = res.data.name
}
})
}
})
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
@ -170,33 +144,51 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '待预提单车返利明细'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
this.formobj = resp.data
this.viewTitle = '单车返利核对审核申请明细'
this.rebateType = row.rebateTypeValue
console.log('编辑回显', row)
req.vehRebateWithDetails(row.vehRebateSid).then((resp) => {
this.list = resp.data
}).catch((e) => {
this.formobj = row
this.list = []
})
},
handleDelete() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
return
}
for (var i = 0; i < this.list.length; i++) {
for (var j = 0; j < this.sids.length; j++) {
if (this.list[i].sid === this.sids[j]) {
this.list.splice(i, 1)
}
}
}
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
handleReturn() {
//
this.formobj = {
applyPeoName: '',
applyTitle: '',
createBySid: '',
createOrgName: '',
createOrgSid: '',
modpriceReason: '',
nodeState: '',
sid: '',
useOrgName: '',
useOrgSid: '',
baseVehinstallModpricedetails: []
const data_list = []
for (var i = 0; i < this.list.length; i++) {
data_list.push({
sid: this.list[i].sid,
rebateTypeValue: this.list[i].rebateTypeValue,
rebateTypeKey: this.list[i].rebateTypeKey,
withRebate: this.list[i].estimateRebate,
brandName: this.list[i].brandName,
brandSid: this.list[i].brandSid,
uploadMoney: this.list[i].uploadMoney,
stayDetermineMoney: this.list[i].stayDetermineMoney,
adjustmentMoney: this.list[i].adjustmentMoney,
money: this.list[i].money
})
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
this.$emit('backAdd', data_list, this.rebateType)
}
}
}

35
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue

@ -13,94 +13,93 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>单车返利待核对申请明细</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-table :key="tableKey" :data="formobj.baseVehinstallModpricedetails" :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">
<template slot-scope="scope">
<span>{{ scope.row.jacketName }}</span>
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.vehModelName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="厂家合同价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="其中运费" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="返利类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.rebateTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="返利名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.rebateName }}</span>
</template>
</el-table-column>
<el-table-column label="预计返利" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.estimateRebate }}</span>
</template>
</el-table-column>
<el-table-column label="所属年月" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.palceGenDate }}</span>
</template>
</el-table-column>
<el-table-column label="上传日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadDate }}</span>
</template>
</el-table-column>
<el-table-column label="上传金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.uploadMoney }}</span>
</template>
</el-table-column>
<el-table-column label="待确定金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.stayDetermineMoney }}</span>
</template>
</el-table-column>
<el-table-column label="费用" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="是否调整" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.isAdjustment }}</span>
</template>
</el-table-column>
<el-table-column label="调整金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentMoney }}</span>
</template>
</el-table-column>
<el-table-column label="调整说明" align="center">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
<span>{{ scope.row.adjustmentRemarks }}</span>
</template>
</el-table-column>
</el-table>

Loading…
Cancel
Save