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

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 3 months ago
parent
bb288c2bf2 c2e8bee8c3
commit
35c8b54acc
21 changed files with 89 additions and 69 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. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java
  2. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java
  3. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java
  4. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
  5. 4
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
  6. 4
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
  7. 4
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
  8. 12
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
  9. 16
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  10. 4
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
  11. 4
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
  12. 4
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
  13. 12
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
  14. 12
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
  15. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
  16. 12
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
  17. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
  18. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
  19. 12
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
  20. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
  21. 12
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java
View File

@ -57,11 +57,16 @@ import java.util.List;
fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class)
public interface ScmSpecialrebateCheckapplydetailFeign {
@ApiOperation("专项返利核对查看详情")
@ApiOperation("专项返利核对查看全部详情")
@GetMapping("/specialRebateCheckDetails/{sid}")
@ResponseBody
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(@PathVariable("sid") String sid);
@ApiOperation("专项返利核对查看分组详情")
@GetMapping("/specialRebateGroupDetails/{sid}")
@ResponseBody
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(@PathVariable("sid") String sid);
@ApiOperation("app查询明细")
@GetMapping("/appMx/{sid}")
@ResponseBody

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java
View File

@ -41,6 +41,11 @@ public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecial
return null;
}
@Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String sid) {
return null;
}
@Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
return null;

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java
View File

@ -60,6 +60,11 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe
return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid);
}
@Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String sid) {
return scmSpecialrebateCheckapplydetailService.specialRebateGroupDetails(sid);
}
@Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
return scmSpecialrebateCheckapplydetailService.appMx(sid);

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
View File

@ -118,4 +118,17 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
}
return rb.success().setData(scmSpecialRebateDetailsVos);
}
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateGroupDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
String[] sids = sid.split(",");
for (String s : sids) {
ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.appMx(s);
scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
}
return rb.success().setData(scmSpecialRebateDetailsVos);
}
}

4
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
View File

@ -100,9 +100,9 @@ export default {
})
},
// 查看明细
vehRebateCheckDetails: function(data) {
vehRebateGroupDetails: function(data) {
return request({
url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateCheckDetails/' + data,
url: '/scm/v1/scmvehrebatecheckapplydetail/vehRebateGroupDetails/' + data,
method: 'get'
})
},

4
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
View File

@ -100,9 +100,9 @@ export default {
})
},
// 查看明细
specialRebateCheckDetails: function(data) {
specialRebateGroupDetails: function(data) {
return request({
url: '/scm/v1/scmspecialrebatecheckapplydetail/specialRebateCheckDetails/' + data,
url: '/scm/v1/scmspecialrebatecheckapplydetail/specialRebateGroupDetails/' + data,
method: 'get'
})
},

4
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
View File

@ -262,9 +262,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -366,9 +366,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)

12
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue
View File

@ -56,8 +56,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -76,8 +76,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -153,9 +153,9 @@ export default {
this.formobj = row
})
},
handleLook() {
handleLook(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.sid)
this.$refs['divInfo'].showInfo(row.vehRebateSids)
},
resetState() {
this.viewState = 1

16
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
View File

@ -30,9 +30,7 @@
<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-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-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
</el-form-item>
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
@ -254,7 +252,7 @@ import ButtonBar from '@/components/ButtonBar'
import bicyclerebatecheck from './bicyclerebatecheck'
import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate'
import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
export default {
name: 'BicycleRebateToBeChecked',
@ -293,7 +291,6 @@ export default {
list: [],
sids: [],
FormLoading: false,
rebateType_list: [],
state_list: [
{
dictKey: '0',
@ -312,7 +309,7 @@ export default {
brandName: '',
createOrgSid: '',
vinNo: '',
rebateTypeKey: '',
rebateTypeValue: '',
rebateName: '',
state: '',
createEndTime: '',
@ -371,11 +368,6 @@ export default {
},
methods: {
init() {
typeValues({ type: 'rebateType' }).then((res) => {
if (res.success) {
this.rebateType_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
@ -450,7 +442,7 @@ export default {
brandName: '',
createOrgSid: '',
vinNo: '',
rebateTypeKey: '',
rebateTypeValue: '',
rebateName: '',
state: '',
createEndTime: '',

4
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue
View File

@ -75,12 +75,12 @@ export default {
}
},
methods: {
showInfo(sid) {
showInfo(vehRebateSids) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '单车返利核对审核申请明细'
req.vehRebateCheckDetails(sid).then((resp) => {
req.vehRebateGroupDetails(vehRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
}

4
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
View File

@ -72,12 +72,12 @@ export default {
}
},
methods: {
showInfo(sid) {
showInfo(specialRebateSids) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '专项返利核对审核申请明细'
req.specialRebateCheckDetails(sid).then((resp) => {
req.specialRebateGroupDetails(specialRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
}

4
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
View File

@ -261,9 +261,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -365,9 +365,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)

12
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
View File

@ -56,8 +56,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -76,8 +76,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -152,9 +152,9 @@ export default {
this.formobj = row
})
},
handleLook() {
handleLook(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.sid)
this.$refs['divInfo'].showInfo(row.specialRebateSids)
},
resetState() {
this.viewState = 1

12
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
View File

@ -56,8 +56,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -76,8 +76,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -223,9 +223,9 @@ export default {
this.formobj = {}
})
},
handleLook() {
handleLook(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.sid)
this.$refs['divInfo'].showInfo(row.vehRebateSids)
},
resetState() {
this.viewState = 1

4
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue
View File

@ -230,9 +230,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -334,9 +334,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) {
if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1)

12
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue
View File

@ -56,8 +56,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -76,8 +76,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -189,9 +189,9 @@ export default {
this.formobj = {}
})
},
handleLook() {
handleLook(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.sid)
this.$refs['divInfo'].showInfo(row.vehRebateSids)
},
resetState() {
this.viewState = 1

4
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue
View File

@ -75,12 +75,12 @@ export default {
}
},
methods: {
showInfo(sid) {
showInfo(vehRebateSids) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '单车返利核对审核申请明细'
req.vehRebateCheckDetails(sid).then((resp) => {
req.vehRebateGroupDetails(vehRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
}

4
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
View File

@ -72,12 +72,12 @@ export default {
}
},
methods: {
showInfo(sid) {
showInfo(specialRebateSids) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '专项返利核对审核申请明细'
req.specialRebateCheckDetails(sid).then((resp) => {
req.specialRebateGroupDetails(specialRebateSids).then((resp) => {
if (resp.success) {
this.list = resp.data
}

12
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
View File

@ -56,8 +56,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -76,8 +76,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -222,9 +222,9 @@ export default {
this.formobj = {}
})
},
handleLook() {
handleLook(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.sid)
this.$refs['divInfo'].showInfo(row.specialRebateSids)
},
resetState() {
this.viewState = 1

4
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
View File

@ -228,9 +228,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
list.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
@ -332,9 +332,9 @@ export default {
})
}
})
let k = 0
// 按照预提年月统计
this.formobj.scmSpecialrebateCheckapplydetailDetails.forEach((s) => {
let k = 0
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].brandName === s.brandName) {
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)

12
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
View File

@ -56,8 +56,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -76,8 +76,8 @@
<el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
<el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
<el-table-column label="明细" align="center" min-width="100">
<template>
<el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -188,9 +188,9 @@ export default {
this.formobj = {}
})
},
handleLook() {
handleLook(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.sid)
this.$refs['divInfo'].showInfo(row.specialRebateSids)
},
resetState() {
this.viewState = 1

Write Preview
Loading…
Cancel
Save