@@ -138,13 +148,15 @@ export default {
listLoading: false,
listQuery: {
params: {
- createOrgSid: '',
+ useOrgName: '',
+ deptName: '',
+ createByName: '',
+ billNo: '',
createEndTime: '',
createStartTime: '',
- closeStartDate: '',
- closeEndDate: '',
+ finishTimeStart: '',
+ finishTimeEnd: '',
withApply: '',
- createOrgName: '',
orgPath: '',
userSid: '',
menuUrl: ''
@@ -268,13 +280,15 @@ export default {
handleReset() {
this.listQuery = {
params: {
- createOrgSid: '',
+ useOrgName: '',
+ deptName: '',
+ createByName: '',
+ billNo: '',
createEndTime: '',
createStartTime: '',
- closeStartDate: '',
- closeEndDate: '',
+ finishTimeStart: '',
+ finishTimeEnd: '',
withApply: '',
- createOrgName: '',
orgPath: '',
userSid: '',
menuUrl: ''
@@ -283,7 +297,7 @@ export default {
size: 5,
total: 0
}
- this.init()
+ this.getList()
},
toAdd() {
this.viewState = 2
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 a34f43c307..d94bb7cb6d 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
@@ -22,15 +22,33 @@
金额单位:元
-
-
- 分公司:
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
{{ formobj.createOrgName }}
-
- 选择
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+ 选择
+
@@ -83,6 +101,7 @@ export default {
// 表单数据
formobj: {
sid: '',
+ createTime: '',
withApply: '',
deptName: '',
deptSid: '',
@@ -137,6 +156,13 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+ var nowDate = new Date()
+ var date = {
+ year: nowDate.getFullYear(),
+ month: nowDate.getMonth() + 1,
+ day: nowDate.getDate()
+ }
+ this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
this.viewTitle = '【新增】专项返利预提申请'
},
showEdit(row) {
@@ -367,6 +393,7 @@ export default {
// 表单数据
this.formobj = {
sid: '',
+ createTime: '',
withApply: '',
deptName: '',
deptSid: '',
@@ -395,7 +422,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
- border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
@@ -403,4 +429,11 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
+.titleOne {
+ padding: 7px;
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-end;
+ align-items: center;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
index 1262138565..6a34f71a55 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingInfo.vue
@@ -22,15 +22,34 @@
金额单位:元
-
-
- 分公司:
- {{ formobj.useOrgName }}
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
@@ -72,7 +91,25 @@ export default {
tableKey: 0,
viewState: 1,
// 表单数据
- formobj: {},
+ formobj: {
+ sid: '',
+ createTime: '',
+ withApply: '',
+ deptName: '',
+ deptSid: '',
+ createOrgName: '',
+ createOrgSid: '',
+ useOrgName: '',
+ useOrgSid: '',
+ remarks: '',
+ withRebateTotal: '',
+ createByName: '',
+ createBySid: '',
+ instanceId: '', // 流程实例ID
+ taskId: '', // 任务ID
+ orgPath: '',
+ scmSpecialRebateWiths: []
+ },
rules: {},
submitdisabled: false
}
@@ -156,7 +193,25 @@ export default {
// 返回(===既判断)
handleReturn() {
// 表单数据
- this.formobj = {}
+ this.formobj = {
+ sid: '',
+ createTime: '',
+ withApply: '',
+ deptName: '',
+ deptSid: '',
+ createOrgName: '',
+ createOrgSid: '',
+ useOrgName: '',
+ useOrgSid: '',
+ remarks: '',
+ withRebateTotal: '',
+ createByName: '',
+ createBySid: '',
+ instanceId: '', // 流程实例ID
+ taskId: '', // 任务ID
+ orgPath: '',
+ scmSpecialRebateWiths: []
+ }
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
@@ -169,7 +224,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
- border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
index 2a69cd0800..c1acbfa1cb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
@@ -17,9 +17,35 @@
{{ formobj.checkApply }}专项返利核对审核申请
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
本月上传返利核对情况(按返利类型统计)
+
+
@@ -38,6 +64,8 @@
本月上传返利核对情况(按预提年月统计)
+
+
@@ -117,7 +145,26 @@ export default {
nodeDialogVisible: false,
currentLink: true,
// 表单数据
- formobj: {},
+ formobj: {
+ sid: '',
+ createTime: '',
+ deptSid: '',
+ deptName: '',
+ createByName: '',
+ createBySid: '',
+ checkApply: '',
+ createOrgName: '',
+ createOrgSid: '',
+ useOrgName: '',
+ useOrgSid: '',
+ remarks: '',
+ instanceId: '', // 流程实例ID
+ taskId: '', // 任务ID
+ orgPath: '',
+ scmWhenSpecialrebateCheckapplydetailDetails: [],
+ scmLastSpecialrebateCheckapplydetailDetails: [],
+ scmSpecialrebateCheckapplydetailDetails: []
+ },
rules: {},
submitdisabled: false,
// 环节所需参数
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
index 2515e74a88..4241be551a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
@@ -16,14 +16,38 @@
{{ formobj.checkApply }}专项返利核对审核申请
-
-
- 添加
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
- 本月上传返利核对情况(按返利类型统计)
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
+
+
本月上传返利核对情况(按返利类型统计)
+
选择
+
+
+
@@ -42,6 +66,8 @@
本月上传返利核对情况(按预提年月统计)
+
+
@@ -93,6 +119,7 @@ export default {
// 表单数据
formobj: {
sid: '',
+ createTime: '',
deptSid: '',
deptName: '',
createByName: '',
@@ -164,7 +191,7 @@ export default {
list.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
- if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+ if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -186,6 +213,8 @@ export default {
num: 1,
withRebate: e.estimateRebate,
withholdCost: e.withholdCost,
+ purchaseSystemName: e.purchaseSystemName,
+ purchaseSystemSid: e.purchaseSystemSid,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -203,7 +232,7 @@ export default {
// 按照预提年月统计
list.forEach((s) => {
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
- if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+ 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)
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -223,6 +252,8 @@ export default {
num: 1,
withRebate: s.estimateRebate,
withholdCost: s.withholdCost,
+ purchaseSystemName: s.purchaseSystemName,
+ purchaseSystemSid: s.purchaseSystemSid,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -261,7 +292,7 @@ export default {
list.forEach((e) => {
let v = 0
for (var i in this.formobj.scmWhenSpecialrebateCheckapplydetailDetails) {
- if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
+ if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].brandName === e.brandName) {
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
@@ -283,6 +314,8 @@ export default {
num: 1,
withRebate: e.estimateRebate,
withholdCost: e.withholdCost,
+ purchaseSystemName: e.purchaseSystemName,
+ purchaseSystemSid: e.purchaseSystemSid,
brandName: e.brandName,
brandSid: e.brandSid,
uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -300,7 +333,7 @@ export default {
// 按照预提年月统计
list.forEach((s) => {
for (var l in this.formobj.scmLastSpecialrebateCheckapplydetailDetails) {
- if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
+ 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)
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
@@ -320,6 +353,8 @@ export default {
num: 1,
withRebate: s.estimateRebate,
withholdCost: s.withholdCost,
+ purchaseSystemName: s.purchaseSystemName,
+ purchaseSystemSid: s.purchaseSystemSid,
brandName: s.brandName,
brandSid: s.brandSid,
uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -421,13 +456,6 @@ export default {
text-align: center;
padding: 30px 0 20px 0;
}
-.rowStyle {
- border-left: 0px;
-}
-.colOneStyle {
- border-right: 0px !important;
- border-bottom: 0px !important;
-}
.span-sty {
width: 130px !important;
}
@@ -438,5 +466,12 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
+.titleOne {
+ padding: 7px;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
index 07e565e8e1..21dfea469a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
@@ -15,9 +15,35 @@
{{ formobj.checkApply }}专项返利核对审核申请
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+
本月上传返利核对情况(按返利类型统计)
+
+
@@ -36,6 +62,8 @@
本月上传返利核对情况(按预提年月统计)
+
+
@@ -82,7 +110,26 @@ export default {
lastSpecialrebateKey: 1,
viewState: 1,
// 表单数据
- formobj: {},
+ formobj: {
+ sid: '',
+ createTime: '',
+ deptSid: '',
+ deptName: '',
+ createByName: '',
+ createBySid: '',
+ checkApply: '',
+ createOrgName: '',
+ createOrgSid: '',
+ useOrgName: '',
+ useOrgSid: '',
+ remarks: '',
+ instanceId: '', // 流程实例ID
+ taskId: '', // 任务ID
+ orgPath: '',
+ scmWhenSpecialrebateCheckapplydetailDetails: [],
+ scmLastSpecialrebateCheckapplydetailDetails: [],
+ scmSpecialrebateCheckapplydetailDetails: []
+ },
rules: {},
submitdisabled: false,
// 环节所需参数
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
index 19ba0cb24e..0321dee819 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue
@@ -22,15 +22,34 @@
金额单位:元
-
-
- 分公司:
- {{ formobj.useOrgName }}
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
@@ -105,7 +124,25 @@ export default {
nodeDialogVisible: false,
currentLink: true,
// 表单数据
- formobj: {},
+ formobj: {
+ sid: '',
+ createTime: '',
+ withApply: '',
+ deptName: '',
+ deptSid: '',
+ createOrgName: '',
+ createOrgSid: '',
+ useOrgName: '',
+ useOrgSid: '',
+ remarks: '',
+ withRebateTotal: '',
+ createByName: '',
+ createBySid: '',
+ instanceId: '', // 流程实例ID
+ taskId: '', // 任务ID
+ orgPath: '',
+ scmSpecialRebateWiths: []
+ },
rules: {},
submitdisabled: false,
// 环节所需参数
@@ -163,6 +200,67 @@ export default {
this.formobj = {}
})
},
+ handleLook(row) {
+ this.viewState = 2
+ this.$refs['divInfo'].showInfo(row)
+ },
+ resetState() {
+ this.viewState = 1
+ },
+ // 合计
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计'
+ return
+ }
+ const values = data.map(item => Number(item[column.property]))
+ if (column.property === 'withRebate') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
+ } else if (column.property === 'expectItureCost') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
+ } else if (column.property === 'expectTreatCost') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
+ } else if (column.property === 'expectSuppCost') {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] += ''
+ }
+ })
+ return sums
+ },
// 同意
openAgree(val) {
this.operation = val
@@ -283,67 +381,6 @@ export default {
}, '*')
}
})
- },
- handleLook(row) {
- this.viewState = 2
- this.$refs['divInfo'].showInfo(row)
- },
- resetState() {
- this.viewState = 1
- },
- // 合计
- getSummaries(param) {
- const { columns, data } = param
- const sums = []
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '合计'
- return
- }
- const values = data.map(item => Number(item[column.property]))
- if (column.property === 'withRebate') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- } else if (column.property === 'expectItureCost') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- } else if (column.property === 'expectTreatCost') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- } else if (column.property === 'expectSuppCost') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- }
- })
- return sums
}
}
}
@@ -359,7 +396,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
- border-bottom: 0px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;
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 c746bd3795..0cb0db8d49 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
@@ -21,15 +21,33 @@
金额单位:元
-
-
- 分公司:
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
{{ formobj.createOrgName }}
-
- 选择
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
+ 选择
+
@@ -81,6 +99,7 @@ export default {
// 表单数据
formobj: {
sid: '',
+ createTime: '',
withApply: '',
deptName: '',
deptSid: '',
@@ -369,7 +388,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
- border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;
@@ -377,4 +395,11 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
+.titleOne {
+ padding: 7px;
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-end;
+ align-items: center;
+}
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 1cb5d5fa2b..b0ebae17c1 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
@@ -20,15 +20,34 @@
金额单位:元
-
-
- 分公司:
- {{ formobj.useOrgName }}
+
+
+ 申请编号
+ {{ formobj.billNo }}
+
+
+ 申请日期
+ {{ formobj.createTime }}
+
+
+
+
+ 分公司
+ {{ formobj.createOrgName }}
+
+
+ 申请部门
+ {{ formobj.deptName }}
+
+
+ 申请人
+ {{ formobj.createByName }}
+
@@ -70,9 +89,26 @@ export default {
tableKey: 0,
viewState: 1,
// 表单数据
- formobj: {},
+ formobj: {
+ sid: '',
+ createTime: '',
+ withApply: '',
+ deptName: '',
+ deptSid: '',
+ createOrgName: '',
+ createOrgSid: '',
+ useOrgName: '',
+ useOrgSid: '',
+ remarks: '',
+ withRebateTotal: '',
+ createByName: '',
+ createBySid: '',
+ instanceId: '', // 流程实例ID
+ taskId: '', // 任务ID
+ orgPath: '',
+ scmSpecialRebateWiths: []
+ },
rules: {},
- submitdisabled: false,
// 环节所需参数
linkByParameter: {
businessSid: '',
@@ -238,7 +274,6 @@ export default {
}
.colOneStyle {
border-right: 0px !important;
- border-bottom: 0px !important;
}
.span-sty {
width: 130px !important;