From a2350871cb0c1ef374bab9720834a7a27a99dfc0 Mon Sep 17 00:00:00 2001 From: "Lyj@210615" <18050528999@163.com> Date: Wed, 7 Dec 2022 17:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BAindex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormComponents/CustomForm/index.vue | 29 +- .../FormComponents/ReadForm/FormContent2.vue | 10 +- .../FormComponents/ReadForm/index.vue | 35 +- .../followupentry/components/followReview.vue | 294 ++++++++++ .../followupentry/components/publicDialog.vue | 33 ++ src/views/followupentry/followaudit.vue | 505 ++++++++++-------- .../screening/components/ConfigForms.vue | 11 +- 7 files changed, 658 insertions(+), 259 deletions(-) create mode 100644 src/views/followupentry/components/followReview.vue create mode 100644 src/views/followupentry/components/publicDialog.vue diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue index d275a1c..7d29fb8 100644 --- a/src/components/FormComponents/CustomForm/index.vue +++ b/src/components/FormComponents/CustomForm/index.vue @@ -49,9 +49,11 @@ > - 上一步 - + >上一步 @@ -373,7 +370,7 @@ export default { border: none; .el-collapse-item { &:nth-child(1) { - border-top: 1px solid #e5e5e5; + border-top: 1px solid #cccccc; } } .el-collapse-item__content { @@ -382,7 +379,7 @@ export default { .el-collapse-item__header { background: #fafafa; padding-left: 20px; - border: 1px solid #e5e5e5; + border: 1px solid #cccccc; border-bottom-color: #ccc; border-top: 0px; font-size: 14px; @@ -392,9 +389,9 @@ export default { .el-collapse-item__wrap { border: none; padding: 10px; - border-left: 1px solid #e5e5e5; - border-right: 1px solid #e5e5e5; - // border-bottom: 1px solid #e5e5e5 !important; + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; + // border-bottom: 1px solid #cccccc !important; padding: 0px; // &:hover { // background-color: #ecf8ff; diff --git a/src/components/FormComponents/ReadForm/FormContent2.vue b/src/components/FormComponents/ReadForm/FormContent2.vue index 01f110f..c74257b 100644 --- a/src/components/FormComponents/ReadForm/FormContent2.vue +++ b/src/components/FormComponents/ReadForm/FormContent2.vue @@ -33,6 +33,7 @@ :columns="columns.column || columns.children.column" :group="options.group" @formChange="formChange" + :showIndex="showIndex" > @@ -75,11 +76,18 @@ export default { type: Boolean, default: false, }, + showIndex: { + type: Boolean, + }, }, data() { return {} }, - + provide(){ + return{ + showIndex: this.showIndex + } + }, computed: { isShowIm() { return function (val) { diff --git a/src/components/FormComponents/ReadForm/index.vue b/src/components/FormComponents/ReadForm/index.vue index 55f6600..7a0234f 100644 --- a/src/components/FormComponents/ReadForm/index.vue +++ b/src/components/FormComponents/ReadForm/index.vue @@ -49,7 +49,11 @@ > @@ -335,7 +341,7 @@ export default { border: none; .el-collapse-item { &:nth-child(1) { - border-top: 1px solid #e5e5e5; + border-top: 1px solid #cccccc; } } .el-collapse-item__content { @@ -344,7 +350,7 @@ export default { .el-collapse-item__header { background: #fafafa; padding-left: 20px; - border: 1px solid #e5e5e5; + border: 1px solid #cccccc; border-bottom-color: #ccc; border-top: 0px; font-size: 14px; @@ -354,9 +360,9 @@ export default { .el-collapse-item__wrap { border: none; padding: 10px; - border-left: 1px solid #e5e5e5; - border-right: 1px solid #e5e5e5; - // border-bottom: 1px solid #e5e5e5 !important; + // border-left: 1px solid #cccccc; + // border-right: 1px solid #cccccc; + // border-bottom: 1px solid #cccccc !important; padding: 0px; &:hover { // background-color: #ecf8ff; @@ -397,4 +403,21 @@ export default { } } } +.index-form { + ::v-deep { + // .el-form-item { + .el-form-item__label { + text-align: left; + background: #fafafa; + font-size: 14px; + color: #333333; + border-right: 1px solid #cccccc; + width: 80px !important; + padding: 18px 10px; + margin-right: 20px; + text-align: center; + } + } + // } +} diff --git a/src/views/followupentry/components/followReview.vue b/src/views/followupentry/components/followReview.vue new file mode 100644 index 0000000..86bfbc8 --- /dev/null +++ b/src/views/followupentry/components/followReview.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/src/views/followupentry/components/publicDialog.vue b/src/views/followupentry/components/publicDialog.vue new file mode 100644 index 0000000..b0ea9dc --- /dev/null +++ b/src/views/followupentry/components/publicDialog.vue @@ -0,0 +1,33 @@ + + + diff --git a/src/views/followupentry/followaudit.vue b/src/views/followupentry/followaudit.vue index 6b7f5ad..7a52d9b 100644 --- a/src/views/followupentry/followaudit.vue +++ b/src/views/followupentry/followaudit.vue @@ -1,244 +1,289 @@ - + diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue index 2c42156..d97bc62 100644 --- a/src/views/screening/components/ConfigForms.vue +++ b/src/views/screening/components/ConfigForms.vue @@ -1,12 +1,11 @@