@@ -109,7 +90,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
-import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import collectionrebatewithholdingAdd from './collectionrebatewithholdingAdd'
import collectionrebatewithholdingInfo from './collectionrebatewithholdingInfo'
import { getStorage } from '@/utils/auth'
@@ -161,14 +142,17 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
- brand_list: [],
listQuery: {
params: {
createOrgSid: '',
- brandSid: '',
+ useOrgName: '',
+ deptName: '',
+ createByName: '',
collectionApply: '',
createEndTime: '',
createStartTime: '',
+ closeStartDate: '',
+ closeEndDate: '',
orgPath: '',
userSid: '',
menuUrl: ''
@@ -223,11 +207,6 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
- brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
- if (res.success) {
- this.brand_list = res.data
- }
- })
this.getList()
}
})
@@ -280,7 +259,7 @@ export default {
req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
- if (response.success && response.data && response.data.total > 0) {
+ if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@@ -298,10 +277,14 @@ export default {
this.listQuery = {
params: {
createOrgSid: '',
- brandSid: '',
+ useOrgName: '',
+ deptName: '',
+ createByName: '',
collectionApply: '',
createEndTime: '',
createStartTime: '',
+ closeStartDate: '',
+ closeEndDate: '',
orgPath: '',
userSid: '',
menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
index df9fa7aeee..fc6ef48f5d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
@@ -18,68 +18,43 @@
{{ formobj.collectionApply }}回款返利预提申请
-
-
-
- 金额单位：元
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
-
-
-
- 品牌:
+
+ 申请部门
+ {{ formobj.deptName }}
-
-
-
-
-
-
+
+ 申请人
+ {{ formobj.createByName }}
-
- 选择
+
+
+
+ 选择
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
-
+
+
+
+
+
+
查看
-
- 备注
-
-
-
-
-
+
+ 备注
+
@@ -93,7 +68,7 @@
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
index 50c4d123e3..76a00ba3a0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
@@ -14,65 +14,38 @@
{{ formobj.collectionApply }}回款返利预提申请
-
-
-
- 金额单位：元
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
-
-
-
- 品牌:
-
-
-
- {{ formobj.brandName }}
-
+
+ 申请部门
+ {{ formobj.deptName }}
-
+
+ 申请人
+ {{ formobj.createByName }}
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
-
+
+
+
+
+
+
查看
-
- 备注
-
-
-
- {{ formobj.remarks }}
-
+
+ 备注
+ {{ formobj.remarks }}
@@ -101,11 +74,11 @@ export default {
// 表单数据
formobj: {
sid: '',
- brandName: '',
- brandSid: '',
+ deptName: '',
+ deptSid: '',
collectionApply: '',
createOrgName: '',
- createOrgSId: '',
+ createOrgSid: '',
useOrgName: '',
useOrgSid: '',
remarks: '',
@@ -165,21 +138,6 @@ export default {
}, 0)
sums[index] += ''
this.formobj.withRebateTotal = sums[index] += ''
- } else {
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.amount = sums[index] += ''
- } else {
- sums[index] = ''
- }
}
})
return sums
@@ -190,11 +148,11 @@ export default {
// 表单数据
this.formobj = {
sid: '',
- brandName: '',
- brandSid: '',
+ deptName: '',
+ deptSid: '',
collectionApply: '',
createOrgName: '',
- createOrgSId: '',
+ createOrgSid: '',
useOrgName: '',
useOrgSid: '',
remarks: '',
@@ -213,11 +171,10 @@ export default {
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
index aabbebde32..8aa1048a9d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
@@ -23,46 +23,20 @@
查看
-
-
- {{ scope.row.brandName }}
-
-
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.manufaBankAccount }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.collectionDate }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -87,8 +61,10 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
- collectionTypeValue: '',
- calculationStandard: '',
+ purchaseSystemName: '',
+ brandName: '',
+ rebateTypeValue: '',
+ rebateName: '',
sids: [],
// 表单数据
list: [],
@@ -110,11 +86,15 @@ export default {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '待预提回款返利明细'
- this.collectionTypeValue = row.collectionTypeValue
- this.calculationStandard = row.calculationStandard
+ this.purchaseSystemName = row.purchaseSystemName
+ this.brandName = row.brandName
+ this.rebateTypeValue = row.rebateTypeValue
+ this.rebateName = row.rebateName
console.log('编辑回显', row.sid)
req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
- this.list = resp.data
+ if (resp.success) {
+ this.list = resp.data
+ }
}).catch((e) => {
this.formobj = row
})
@@ -149,17 +129,17 @@ export default {
for (var i = 0; i < this.list.length; i++) {
data_list.push({
sid: this.list[i].sid,
- collectionTypeValue: this.list[i].collectionTypeValue,
- collectionTypeKey: this.list[i].collectionTypeKey,
- collectionMoney: this.list[i].collectionMoney,
- freight: this.list[i].freight,
- estimateRebate: this.list[i].estimateRebate,
- calculationStandard: this.list[i].calculationStandard,
+ purchaseSystemName: this.list[i].purchaseSystemName,
+ purchaseSystemSid: this.list[i].purchaseSystemSid,
brandName: this.list[i].brandName,
- brandSid: this.list[i].brandSid
+ brandSid: this.list[i].brandSid,
+ rebateTypeKey: this.list[i].rebateTypeKey,
+ rebateTypeValue: this.list[i].rebateTypeValue,
+ rebateName: this.list[i].rebateName,
+ estimateRebate: this.list[i].estimateRebate
})
}
- this.$emit('backAdd', data_list, this.collectionTypeValue, this.calculationStandard)
+ this.$emit('backAdd', data_list, this.purchaseSystemName, this.brandName, this.rebateTypeValue, this.rebateName)
}
}
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
index 140d584f0b..082aadda8e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
@@ -21,46 +21,20 @@
查看
-
-
- {{ scope.row.brandName }}
-
-
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.manufaBankAccount }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.collectionDate }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,7 +73,9 @@ export default {
this.viewTitle = '待预提回款返利明细'
console.log('编辑回显', row.sid)
req.collectionRebateWithDetails(row.collectionRebateSids).then((resp) => {
- this.list = resp.data
+ if (resp.success) {
+ this.list = resp.data
+ }
}).catch((e) => {
this.formobj = row
})
@@ -112,8 +88,7 @@ export default {
this.viewState = 1
},
// 返回（===既判断）
- handleReturn(isreload) {
- if (isreload === 'true') this.$emit('reloadlist')
+ handleReturn() {
// 表单数据
this.list = []
this.$refs['form_obj'].resetFields()
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
index d1cafc3361..15f04558b0 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
@@ -8,6 +8,12 @@
{{ searchxianshitit }}
查询
@@ -43,46 +57,20 @@
查看
-
-
- {{ scope.row.brandName }}
-
-
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.manufaBankAccount }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.collectionDate }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -130,10 +118,14 @@ export default {
sids: [],
FormLoading: false,
listLoading: false,
+ rebateType_list: [],
collectionType_list: [],
listQuery: {
params: {
- brandSid: '',
+ purchaseSystemName: '',
+ brandName: '',
+ rebateTypeKey: '',
+ rebateName: '',
collectionEndDate: '',
collectionStartDate: '',
collectionTypeKey: '',
@@ -160,6 +152,11 @@ export default {
this.collectionType_list = res.data
}
})
+ typeValues({ type: 'rebateType' }).then((res) => {
+ if (res.success) {
+ this.rebateType_list = res.data
+ }
+ })
},
// 搜索条件效果
clicksearchShow() {
@@ -187,22 +184,7 @@ export default {
return pageindex
},
handleSelectionChange(row) {
- const aa = []
- row.forEach((element) => {
- aa.push({
- sid: element.sid,
- collectionTypeValue: element.collectionTypeValue,
- collectionTypeKey: element.collectionTypeKey,
- collectionMoney: element.collectionMoney,
- freight: element.freight,
- estimateRebate: element.estimateRebate,
- calculationStandard: element.calculationStandard,
- brandName: element.brandName,
- brandSid: element.brandSid
- })
- })
- this.sids = aa
- console.log('sids', this.sids)
+ this.sids = row
},
// 查询列表信息
getList() {
@@ -210,7 +192,7 @@ export default {
req.pageList(this.listQuery).then((response) => {
console.log('列表查询结果：', response)
this.listLoading = false
- if (response.success && response.data && response.data.total > 0) {
+ if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@@ -219,9 +201,8 @@ export default {
}
})
},
- showData(value, 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++) {
@@ -245,6 +226,10 @@ export default {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
+ this.listQuery.params.purchaseSystemName = ''
+ this.listQuery.params.brandName = ''
+ this.listQuery.params.rebateTypeKey = ''
+ this.listQuery.params.rebateName = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.createEndTime = ''
this.listQuery.params.collectionEndDate = ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
index ae9c230fc3..ef1e7a9ff6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
@@ -16,65 +16,38 @@
{{ formobj.collectionApply }}回款返利预提申请
-
-
-
- 金额单位：元
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
-
-
-
- 品牌:
-
-
-
- {{ formobj.brandName }}
-
+
+ 申请部门
+ {{ formobj.deptName }}
-
+
+ 申请人
+ {{ formobj.createByName }}
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
-
+
+
+
+
+
+
查看
-
- 备注
-
-
-
- {{ formobj.remarks }}
-
+
+ 备注
+ {{ formobj.remarks }}
@@ -87,14 +60,14 @@
- 当前环节:
- {{ current.taskName }}->{{ nextNode.name }}
+ 当前环节:
+ {{ current.taskName }}->{{ nextNode.name }}
- 意见:
-
+ 意见:
+
@@ -124,11 +97,11 @@ export default {
// 表单数据
formobj: {
sid: '',
- brandName: '',
- brandSid: '',
+ deptName: '',
+ deptSid: '',
collectionApply: '',
createOrgName: '',
- createOrgSId: '',
+ createOrgSid: '',
useOrgName: '',
useOrgSid: '',
remarks: '',
@@ -359,21 +332,6 @@ export default {
}, 0)
sums[index] += ''
this.formobj.withRebateTotal = sums[index] += ''
- } else {
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.amount = sums[index] += ''
- } else {
- sums[index] = ''
- }
}
})
return sums
@@ -387,14 +345,13 @@ export default {
text-align: center;
padding: 30px 0 20px 0;
}
-.rowStyle {
- border-left: 0px;
-}
-.colOneStyle {
- border-right: 0px !important;
- border-bottom: 0px !important;
-}
.rowClass {
border-top: 1px solid #E0E3EB;
}
+.span-sty {
+ width: 130px !important;
+}
+.addinputInfo {
+ margin-left: 120px !important;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
index 6b1ef4fee8..5e5012dba3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
@@ -7,78 +7,51 @@
{{ viewTitle }}
- 保存
-
- 提交
-
+ 保存
+ 提交
{{ formobj.collectionApply }}回款返利预提申请
-
-
-
- 金额单位：元
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
-
-
-
- 品牌:
+
+ 申请部门
+ {{ formobj.deptName }}
-
-
-
-
-
-
+
+ 申请人
+ {{ formobj.createByName }}
-
- 选择
+
+
+
+ 选择
-
-
- {{ scope.row.collectionTypeValue }}
-
-
-
-
- {{ scope.row.collectionMoney }}
-
-
-
-
- {{ scope.row.freight }}
-
-
-
-
- {{ scope.row.calculationStandard }}
-
-
-
-
- {{ scope.row.estimateRebate }}
-
-
-
+
+
+
+
+
+
查看
-
- 备注
-
-
-
-
-
+
+ 备注
+
@@ -92,7 +65,6 @@