From 029ffe94807ceaf18d4d6dc5ad84a8626d70631e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:10:56 +0800
Subject: [PATCH] 1.提交
---
src/views/scgl/gd.vue | 4 ++--
src/views/bbgl/bzgz.vue | 4 ++--
src/views/scgl/sckbg.vue | 4 ++--
src/views/bbgl/rygz.vue | 8 +++++---
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 1eca63f..f8c3d09 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -221,7 +221,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="璁颁欢宸ヨ祫"
+ label="璁′欢宸ヨ祫"
width="110"
sortable="custom"
>
@@ -385,7 +385,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="璁颁欢宸ヨ祫"
+ label="璁′欢宸ヨ祫"
width="110"
sortable="custom"
>
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 6ed1adb..1575232 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -236,7 +236,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="涓汉璁颁欢宸ヨ祫"
+ label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
@@ -383,7 +383,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="涓汉璁颁欢宸ヨ祫"
+ label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
@@ -575,8 +575,10 @@
const { columns, data } = param
const sums = []
+ const i = this.form.compute === 'last' ? 11 : 10
+
columns.forEach((column, index) => {
- if (index === 11) {
+ if (index === i) {
sums[index] = '鎬讳环'
return
}
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index a7c36c3..1c7e796 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -1758,8 +1758,8 @@
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
{ code: 'CLOSED', name: '瀹屽伐' },
- { code: 'NOSCHED', name: '寰呮帓绋�' },
- { code: 'SCHED', name: '宸叉帓绋�' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
],
total: 10,
radioSelected: '',
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index f9738fd..14c0db3 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1802,7 +1802,7 @@
this.dialogForm.startqty = obj.noreportqty
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode? obj.nextstepcode : obj.stepcode
this.dialogForm.startqtySum = obj.noreportqty
})
@@ -1863,7 +1863,7 @@
this.dialogForm.stepcode = obj.stepcode
this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
+ this.dialogForm.nextstepcode = obj.nextstepcode? obj.nextstepcode : obj.stepcode
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
--
Gitblit v1.9.3