From d5d06c3721e0a8c2c3bfc68f238ad55f051c70a6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 9 Oct 2024 13:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9=E8=BF=94?= =?UTF-8?q?=E5=88=A9=E9=A2=84=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/zhuanxiangfanliAdd.vue | 59 +++--- .../relation/zhuanxiangfanliInfo.vue | 47 ++--- .../relation/zhuanxiangfanliselect.vue | 70 +++---- .../specialrebatewithholding.vue | 67 +++---- .../specialrebatewithholdingAdd.vue | 179 +++++++---------- .../specialrebatewithholdingInfo.vue | 75 +++---- .../relation/zhuanxiangfanliyutiAdd.vue | 59 +++--- .../relation/zhuanxiangfanliyutiInfo.vue | 47 ++--- .../relation/zhuanxiangfanliyutichoose.vue | 70 +++---- .../zhuanxiangfanliyutiDaiBanInfo.vue | 99 +++------- .../zhuanxiangfanliyutiEdit.vue | 185 +++++++----------- .../zhuanxiangfanliyutiYiBanInfo.vue | 77 +++----- 12 files changed, 380 insertions(+), 654 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue index 451576d024..1e5c432b4d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue @@ -18,31 +18,19 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -62,6 +50,8 @@ export default { index: 0, tableKey: 0, rebateType: '', + purchaseSystem: '', + brandName: '', sids: [], // 表单数据 list: [], @@ -84,20 +74,20 @@ export default { }) this.viewTitle = '待预提专项返利明细' this.rebateType = row.rebateTypeValue + this.purchaseSystem = row.purchaseSystemName + this.brandName = row.brandName console.log('编辑回显', row.sid) req.vehRebateWithDetails(row.specialRebateSids).then((resp) => { - this.list = resp.data + if (resp.success) { + this.list = resp.data + } }).catch((e) => { this.formobj = row }) }, handleDelete() { if (this.sids.length === 0) { - this.$message({ - showClose: true, - type: 'error', - message: '请选择至少一条记录进行删除操作' - }) + this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) return } for (var i = 0; i < this.list.length; i++) { @@ -114,14 +104,19 @@ export default { for (var i = 0; i < this.list.length; i++) { data_list.push({ sid: this.list[i].sid, + purchaseSystemName: this.list[i].purchaseSystemName, + purchaseSystemSid: this.list[i].purchaseSystemSid, rebateTypeValue: this.list[i].rebateTypeValue, rebateTypeKey: this.list[i].rebateTypeKey, withRebate: this.list[i].estimateRebate, + expectItureCost: this.list[i].expectItureCost, + expectTreatCost: this.list[i].expectTreatCost, + expectSuppCost: this.list[i].expectSuppCost, brandName: this.list[i].brandName, brandSid: this.list[i].brandSid }) } - this.$emit('backAdd', data_list, this.rebateType) + this.$emit('backAdd', data_list, this.rebateType, this.purchaseSystem, this.brandName) } } } diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue index 103bbb70e7..9da646947b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue @@ -15,32 +15,20 @@
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
@@ -73,14 +61,15 @@ export default { this.viewTitle = '待预提专项返利明细' console.log('编辑回显', row.sid) req.vehRebateWithDetails(row.specialRebateSids).then((resp) => { - this.list = resp.data + if (resp.success) { + this.list = resp.data + } }).catch((e) => { this.formobj = row }) }, // 返回（===既判断） - 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/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue index 9d81bc9d99..2e602ba9da 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue @@ -8,10 +8,11 @@ {{ searchxianshitit }}
+ + + - - - + @@ -41,31 +42,16 @@ - - - - - - - - - - - - - - - + + + + + + + + + +
@@ -81,7 +67,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' import Pagination from '@/components/pagination' import ButtonBar from '@/components/ButtonBar' -import { brandDown, typeValues } from '@/api/cheliang/dictcommons' +import { typeValues } from '@/api/cheliang/dictcommons' export default { name: 'ZhuanXiangFanLiSelect', @@ -110,11 +96,11 @@ export default { FormLoading: false, listLoading: false, rebateType_list: [], - brand_list: [], listQuery: { params: { createOrgSid: '', - brandSid: '', + purchaseSystemName: '', + brandName: '', rebateTypeKey: '', rebateName: '', createEndTime: '', @@ -138,11 +124,6 @@ export default { this.rebateType_list = res.data } }) - brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => { - if (res.success) { - this.brand_list = res.data - } - }) }, // 搜索条件效果 clicksearchShow() { @@ -174,9 +155,14 @@ export default { row.forEach((element) => { aa.push({ sid: element.sid, + purchaseSystemName: element.purchaseSystemName, + purchaseSystemSid: element.purchaseSystemSid, rebateTypeValue: element.rebateTypeValue, rebateTypeKey: element.rebateTypeKey, withRebate: element.estimateRebate, + expectItureCost: element.expectItureCost, + expectTreatCost: element.expectTreatCost, + expectSuppCost: element.expectSuppCost, brandName: element.brandName, brandSid: element.brandSid }) @@ -199,9 +185,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++) { @@ -229,18 +214,15 @@ export default { this.listQuery.params.createEndTime = '' this.listQuery.params.rebateTypeKey = '' this.listQuery.params.rebateName = '' + this.listQuery.params.purchaseSystemName = '' + this.listQuery.params.brandName = '' this.getList() }, handleConfirm() { 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/specialrebate/specialrebatewithholding/specialrebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue index 2023269fbf..a92ba78489 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue @@ -8,12 +8,10 @@ {{ searchxianshitit }}
- - - - + + - + @@ -21,6 +19,11 @@ 至 + + + 至 + +
查询 @@ -48,36 +51,14 @@ {{ scope.row.nodeState }} - - - - - - - - - - - - - - - - - - + + + + + + + +
@@ -99,7 +80,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' 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 specialrebatewithholdingAdd from './specialrebatewithholdingAdd' import specialrebatewithholdingInfo from './specialrebatewithholdingInfo' import { getStorage } from '@/utils/auth' @@ -151,14 +132,15 @@ export default { sids: [], FormLoading: false, listLoading: false, - brand_list: [], listQuery: { params: { createOrgSid: '', createEndTime: '', createStartTime: '', + closeStartDate: '', + closeEndDate: '', withApply: '', - brandSid: '', + createOrgName: '', orgPath: '', userSid: '', menuUrl: '' @@ -213,11 +195,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() } }) @@ -290,8 +267,10 @@ export default { createOrgSid: '', createEndTime: '', createStartTime: '', + closeStartDate: '', + closeEndDate: '', withApply: '', - brandSid: '', + createOrgName: '', orgPath: '', userSid: '', menuUrl: '' diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue index f53446e7ec..9cb83bb362 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue @@ -7,10 +7,8 @@
{{ viewTitle }}
- 保存 - - 提交 - + 保存 + 提交 关闭
@@ -18,63 +16,40 @@
{{ formobj.withApply }}专项返利预提申请
- + - -
金额单位：元
+ +
金额单位：元
 - - 品牌: + +
分公司：
+ {{ formobj.createOrgName }} - - - - - - - - - 选择 + +
选择
 - - - - - - - - - - + + + + + + + + - - - - - - - 备注 - - - - - + +
备注
+ @@ -88,7 +63,7 @@ @@ -362,12 +324,6 @@ export default { text-align: center; padding: 30px 0 20px 0; } -.spanTwoWidth { - width: 150px !important; -} -.addinputOne { - margin-left: 140px !important; -} .rowStyle { border-left: 0px; } @@ -375,5 +331,14 @@ export default { 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/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue index ba91ea0fbd..f4c8b42b3a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue @@ -7,73 +7,48 @@
{{ viewTitle }}
- 保存 - - 提交 - + 保存 + 提交
{{ formobj.withApply }}专项返利预提申请
- + - -
金额单位：元
+ +
金额单位：元
 - - 品牌: + +
分公司：
+ {{ formobj.createOrgName }} - - - - - - - - - 选择 + +
选择
 - - - - - - - - - - + + + + + + + + - - - - - - - 备注 - - - - - + +
备注
+ @@ -87,7 +62,6 @@ @@ -400,4 +341,10 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } +.span-sty { + width: 130px !important; +} +.addinputInfo { + margin-left: 120px !important; +} diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue index ac0a2640cb..34f8ee4ee8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue @@ -14,58 +14,36 @@
{{ formobj.withApply }}专项返利预提申请
- + - -
金额单位：元
+ +
金额单位：元
 - - 品牌: - - - - {{ formobj.brandName }} - + +
分公司：
+ {{ formobj.useOrgName }} - - - - - - - - - - + + + + + + + - - - - - - - 备注 - - - - {{ formobj.remarks }} - + +
备注
+ {{ formobj.remarks }} @@ -138,7 +116,7 @@ export default { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - this.viewTitle = '预提申请详情' + this.viewTitle = '专项返利预提申请详情' console.log('编辑回显', sid) req.fetchBySid(sid).then((resp) => { if (resp.success) { @@ -175,21 +153,6 @@ export default { } }, 0) 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 @@ -247,5 +210,11 @@ export default { border-right: 0px !important; border-bottom: 0px !important; } +.span-sty { + width: 130px !important; +} +.addinputInfo { + margin-left: 120px !important; +}