-
待核对回款返利列表
+
已上传待核对回款返利列表
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
@@ -118,12 +77,10 @@ export default { tableKey: 0, list: [], sids: [], - sids_list: [], FormLoading: false, listLoading: false, listQuery: { params: { - brandSid: '', createOrgSid: '', sidList: [] }, @@ -171,40 +128,7 @@ export default { return pageindex }, handleSelectionChange(row) { - var dateTime = '' - let date = new Date() - let year = date.getFullYear() // 年 - let month = date.getMonth() + 1 // 月 - dateTime = year + '年' + month + '月' - const aa = [] - const bb = [] - row.forEach((element) => { - if (element.withholdingDateCopy === dateTime) { - aa.push({ - sid: element.sid, - collectionTypeValue: element.collectionTypeValue, - collectionTypeKey: element.collectionTypeKey, - collectionMoney: element.collectionMoney, - estimateRebate: element.estimateRebate, - brandName: element.brandName, - brandSid: element.brandSid, - uploadMoney: element.uploadMoney, - adjustmentMoney: element.adjustmentMoney - }) - } else { - bb.push({ - sid: element.sid, - withholdingDate: element.withholdingDateCopy, - collectionMoney: element.collectionMoney, - estimateRebate: element.estimateRebate, - uploadMoney: element.uploadMoney, - adjustmentMoney: element.adjustmentMoney - }) - } - }) - this.sids = aa - this.sids_list = bb - console.log('sids', this.sids, bb, 99999999) + this.sids = row }, // 查询列表信息 getList() { @@ -212,7 +136,7 @@ export default { req.checkApplyGetAlreadyUploadCollectionRebate(this.listQuery).then((response) => { console.log('列表查询结果：', response) this.listLoading = false - if (response.success && response.data && response.data.total > 0) { + if (response.success) { this.list = response.data.records this.listQuery.total = response.data.total } else { @@ -221,9 +145,8 @@ export default { } }) }, - showData(value, val, createOrgSid, brandSid) { + showData(value, createOrgSid) { this.listQuery.params.createOrgSid = createOrgSid - this.listQuery.params.brandSid = brandSid const aa = [] if (value.length > 0) { for (var i = 0; i < value.length; i++) { @@ -232,26 +155,7 @@ export default { } } } - const bb = [] - if (val.length > 0) { - for (var k = 0; k < val.length; k++) { - for (var l = 0; l < val[k].collectionRebateSids.length; l++) { - bb.push(val[k].collectionRebateSids[l]) - } - } - } - if (aa.length > 0 && bb.length > 0) { - this.listQuery.params.sidList = aa - for (var p = 0; p < bb.length; p++) { - this.listQuery.params.sidList.push(bb[p]) - } - } else if (aa.length > 0 && bb.length === 0) { - this.listQuery.params.sidList = aa - } else if (aa.length === 0 && bb.length > 0) { - this.listQuery.params.sidList = bb - } else if (aa.length === 0 && bb.length === 0) { - this.listQuery.params.sidList = [] - } + this.listQuery.params.sidList = aa this.getList() }, // 查询按钮 @@ -273,15 +177,10 @@ export default { this.getList() }, doConfirm() { - if (this.sids.length > 0 || this.sids_list.length > 0) { - this.$emit('backData', this.sids, this.sids_list) + if (this.sids.length > 0) { + this.$emit('backData', this.sids) } else { - this.$notify({ - title: '提示', - message: '请选择至少一条记录!', - type: 'error', - duration: 2000 - }) + this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 }) } }, doClose() { diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue index 0403b4be0b..0ffff568ae 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue @@ -26,9 +26,9 @@ - + 至 - +
@@ -68,7 +68,7 @@ - +
@@ -151,8 +151,8 @@ export default { collectionApply: '', createEndTime: '', createStartTime: '', - closeStartDate: '', - closeEndDate: '', + finishTimeStart: '', + finishTimeEnd: '', orgPath: '', userSid: '', menuUrl: '' @@ -283,8 +283,8 @@ export default { collectionApply: '', createEndTime: '', createStartTime: '', - closeStartDate: '', - closeEndDate: '', + finishTimeStart: '', + finishTimeEnd: '', orgPath: '', userSid: '', menuUrl: '' diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue index dbd03695b6..9018ea8183 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue @@ -16,44 +16,14 @@
{{ formobj.checkApply }}回款返利核对审核申请
- - - - 品牌: - - - - {{ formobj.brandName }} - - - + - - - - - - - - - - - - - - - + + + + +