From 43c4e92784dcfb82872a3f1ff2e49ea0f054c7e2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:11:57 +0800
Subject: [PATCH] 1.提交
---
src/views/bbgl/bzgz.vue | 2 +-
src/views/scgl/sckbg.vue | 4 ++--
src/views/zzmx/gxdy.vue | 4 ++--
src/router/index.js | 4 ++--
src/views/bbgl/rygz.vue | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index c8a5016..7346650 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -150,7 +150,7 @@
code: '1013',
component: () => import('@/views/jcsz/wldw'),
meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
- },
+ }
// {
// path: 'adsz',
// name: 'ADZZCancel',
@@ -195,7 +195,7 @@
code: '1022',
component: () => import('@/views/sbgl/sbqd'),
meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
- },
+ }
// {
// path: 'djbz',
// name: 'DJBZCancel',
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 75d3358..4a48745 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -186,7 +186,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 0ebe102..eb67c62 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -189,7 +189,7 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="涓汉璁颁欢宸ヨ祫"
+ label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 0f6c542..a58e108 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1699,7 +1699,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
})
@@ -1760,7 +1760,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
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index edc9fc6..21754f1 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -364,7 +364,7 @@
:data="workDialogForm.workTreeArr"
show-checkbox
node-key="code"
- style="height: 280px;"
+ style="height: 280px;overflow: auto"
default-expand-all
:props="workTreeDefaultProps"
@check="checkBoxClick"
@@ -411,7 +411,7 @@
:data="defectTree"
show-checkbox
node-key="code"
- style="height: 400px;"
+ style="height: 400px;overflow: auto"
default-expand-all
:props="workTreeDefaultProps"
/>
--
Gitblit v1.9.3