From 518db43708d281b8b2db8b4f674486ff19b16609 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 14 Jul 2022 08:47:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=E2=80=94=E2=80=94=E5=BE=85?=
=?UTF-8?q?=E5=87=BA=E5=BA=93=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/chukuguanli/chukubanli/daichukucheliang.vue | 2 +-
.../src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue
index 75e8e01898..3f298b66e9 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue
@@ -24,7 +24,7 @@
-
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue
index 230b83b9b5..a64a99b2a4 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue
@@ -24,7 +24,7 @@
-
+
From c58b22a6fee4bc157ef468fc99a59d5cbea79d77 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 14 Jul 2022 10:04:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=92=E4=BA=A7?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AE=A2=E9=87=91=E5=90=88=E8=AE=A1=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cheliangpaichan/cheliangpaichanAdd.vue | 51 ++++++---------
.../cheliangpaichan/cheliangpaichanInfo.vue | 44 +++++--------
.../cheliangpaichanDaiBanInfo.vue | 62 ++++++++----------
.../paichanguanli/cheliangpaichanEdit.vue | 53 ++++++---------
.../cheliangpaichanYiBanInfo.vue | 64 ++++++++-----------
5 files changed, 106 insertions(+), 168 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index d954baf385..20cc58c827 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -71,37 +71,35 @@
-
-
-
-
+
+
+
- 删除
+ 删除
- 上装选择
+ 上装选择
-
+
{{ scope.row.vehicleName }}
-
-
+
+
{{ scope.row.configName }}
-
+
-
+
@@ -115,23 +113,23 @@
-
-
+
+
-
+
-
+
-
+
查看
@@ -402,22 +400,11 @@ export default {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '合计'
+ sums[index] = '申请订金合计'
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'useDeposit') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.useMoney = sums[index] += ''
- } else if (column.property === 'applyForDeposit') {
+ if (column.property === 'applyForDeposit') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -427,7 +414,7 @@ export default {
}
}, 0)
sums[index] += ''
- this.applyMoney = sums[index] += ''
+ this.formobj.currentAmount = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index abf306116b..ef5270e0fa 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -7,7 +7,7 @@
{{ viewTitle }}
- 返回
+ 关闭
@@ -65,26 +65,25 @@
-
-
-
+
+
-
+
{{ scope.row.vehicleName }}
-
-
+
+
{{ scope.row.configName }}
-
+
{{ scope.row.insideCode }}
-
+
{{ scope.row.quantity }}
@@ -98,23 +97,23 @@
{{ scope.row.applyForDeposit }}
-
-
+
+
{{ scope.row.contractPrice }}
-
+
{{ scope.row.saleGuPrice }}
-
+
{{ scope.row.remarks }}
-
+
查看
@@ -228,11 +227,11 @@ export default {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '合计'
+ sums[index] = '申请订金合计'
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'useDeposit') {
+ if (column.property === 'applyForDeposit') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -242,18 +241,7 @@ export default {
}
}, 0)
sums[index] += ''
- this.useMoney = sums[index] += ''
- } else if (column.property === 'applyForDeposit') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.applyMoney = sums[index] += ''
+ this.formobj.currentAmount = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index 6cc854075f..20afcc391c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -67,26 +67,25 @@
-
-
-
+
+
-
+
{{ scope.row.vehicleName }}
-
-
+
+
{{ scope.row.configName }}
-
-
+
+
{{ scope.row.insideCode }}
-
-
+
+
{{ scope.row.quantity }}
@@ -95,28 +94,28 @@
-
+
{{ scope.row.applyForDeposit }}
-
-
+
+
{{ scope.row.contractPrice }}
-
-
+
+
{{ scope.row.saleGuPrice }}
-
-
+
+
{{ scope.row.remarks }}
-
+
查看
@@ -156,8 +155,8 @@
- 流程图
-
+
+
@@ -187,7 +186,7 @@
import req from '@/api/supplychain/busvehicleapply'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
- name: 'cheliangpaichandetails',
+ name: 'cheliangpaichanDaiBanInfo',
components: {
flow
},
@@ -254,8 +253,8 @@ export default {
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
// 加载流程图相关的数据
- this.getModelDetail(obj.deployId)
- this.getFlowViewer(obj.instanceId)
+ // this.getModelDetail(obj.deployId)
+ // this.getFlowViewer(obj.instanceId)
// 加载表单数据
this.showInfo(obj.businessSid)
},
@@ -445,11 +444,11 @@ export default {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '合计'
+ sums[index] = '申请订金合计'
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'useDeposit') {
+ if (column.property === 'applyForDeposit') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -459,18 +458,7 @@ export default {
}
}, 0)
sums[index] += ''
- this.useMoney = sums[index] += ''
- } else if (column.property === 'applyForDeposit') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.applyMoney = sums[index] += ''
+ this.formobj.currentAmount = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index 9848ce4b56..ed42a88be7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -71,37 +71,35 @@
-
-
-
+
+
- 删除
+ 删除
- 上装选择
+ 上装选择
-
-
+
+
{{ scope.row.vehicleName }}
-
-
+
+
{{ scope.row.configName }}
-
+
-
+
@@ -115,23 +113,23 @@
-
-
+
+
-
+
-
-
+
+
-
+
查看
@@ -398,22 +396,11 @@ export default {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '合计'
+ sums[index] = '申请订金合计'
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'useDeposit') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.useMoney = sums[index] += ''
- } else if (column.property === 'applyForDeposit') {
+ if (column.property === 'applyForDeposit') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -423,7 +410,7 @@ export default {
}
}, 0)
sums[index] += ''
- this.applyMoney = sums[index] += ''
+ this.formobj.currentAmount = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index 5536b8c53f..8eaa8976c2 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -65,26 +65,25 @@
-
-
-
-
-
+
+
+
+
{{ scope.row.vehicleName }}
-
-
+
+
{{ scope.row.configName }}
-
-
+
+
{{ scope.row.insideCode }}
-
-
+
+
{{ scope.row.quantity }}
@@ -93,28 +92,28 @@
-
+
{{ scope.row.applyForDeposit }}
-
-
+
+
{{ scope.row.contractPrice }}
-
-
+
+
{{ scope.row.saleGuPrice }}
-
-
+
+
{{ scope.row.remarks }}
-
+
查看
@@ -154,8 +153,8 @@
- 流程图
-
+
+
@@ -164,7 +163,7 @@
import req from '@/api/supplychain/busvehicleapply'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
- name: 'cheliangpaichandetails',
+ name: 'cheliangpaichanYiBanInfo',
components: {
flow
},
@@ -217,8 +216,8 @@ export default {
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
// 加载流程图相关的数据
- this.getModelDetail(obj.deployId)
- this.getFlowViewer(obj.instanceId)
+ // this.getModelDetail(obj.deployId)
+ // this.getFlowViewer(obj.instanceId)
// 加载表单数据
this.showInfo(obj.businessSid)
},
@@ -316,11 +315,11 @@ export default {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '合计'
+ sums[index] = '申请订金合计'
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'useDeposit') {
+ if (column.property === 'applyForDeposit') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -330,18 +329,7 @@ export default {
}
}, 0)
sums[index] += ''
- this.useMoney = sums[index] += ''
- } else if (column.property === 'applyForDeposit') {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr)
- if (!isNaN(value)) {
- return prev + curr
- } else {
- return prev
- }
- }, 0)
- sums[index] += ''
- this.applyMoney = sums[index] += ''
+ this.formobj.currentAmount = sums[index] += ''
} else {
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {