From c68164e76d75ca2d0502383cd4231e0fc18e751b Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Fri, 1 Apr 2022 15:14:37 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052258=20=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=EF=BC=9A=E6=B7=BB=E5=8A=A0=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E5=90=8E=20=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=EF=BC=8C=E7=AB=A0?=
 =?UTF-8?q?=E8=8A=82=E5=90=8D=E7=A7=B0=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardForComments/pags/consultationDetails.vue             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 2ff6db3ea..89cb9de04 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -423,6 +423,7 @@ export default {
         if (type === 'edit') {
           this.id = row.id
           this.opiniontitle = '编辑意见内容'
+          this.opinionContent.chapterName = row.chapterName
           this.opinionContent.partCode = row.partCode
           this.opinionContent.reason = row.reason
           this.opinionContent.oldText = row.oldText

From b09a0e87be28618152deb9b3e711c1c82759c53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 1 Apr 2022 15:44:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?52348=20=E5=9B=BD=E5=86=85=E3=80=81?=
 =?UTF-8?q?=E6=B5=B7=E5=A4=96=E3=80=81=E4=BC=81=E6=A0=87--=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=9C=89=E9=99=84=E4=BB=B6=E7=9A=84=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=A1=8C=E9=AB=98=E7=BC=A9=E5=B0=8F=E4=B8=80?=
 =?UTF-8?q?=E7=82=B9=EF=BC=8C=E9=97=B4=E8=B7=9D=E8=BF=87=E5=A4=A7=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherBussStandardDetails/index.vue | 8 ++++----
 src/pages/details/otherStandardDetails/index.vue     | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index af75bea30..bdb6dc031 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -356,7 +356,7 @@
                       <div class="files-title">
                         <label style="float: left;min-height: 43px;line-height: 43px;" >{{ child.attrName }}</label>
                         <template style="margin-left: 220px;">
-                          <div style="position: relative;margin-left: 214px;min-height: 42px;">
+                          <div style="position: relative;margin-left: 214px; line-height: 32px">
                             <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
                               <!--                          单个文件-->
                               <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
@@ -377,7 +377,7 @@
                                 <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
                               <!--                          多个文件-->
-                              <div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
+                              <div v-else-if="child.value && child.value.length > 0" style="line-height: 32px;">
                             <span>
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -3445,8 +3445,8 @@ export default {
             width: calc(~'100% - 225px');
             & > .files-title{
               width: calc(~'100% - 120px');
-              min-height: 50px;
-              line-height: 50px;
+              min-height: 32px;
+              line-height: 32px;
               font-size: 16px;
               color: #409EFF;
               & > a{
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 384b80992..882372bb5 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -69,7 +69,7 @@
                         <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
-                          <div style="position: relative;margin-left: 214px;">
+                          <div style="position: relative;margin-left: 214px; line-height: 32px">
                             <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
@@ -4272,6 +4272,7 @@ export default {
           }
 
           .modular-content-p-val {
+            line-height: 32px;
             display: inline-block;
             width: calc(~'100% - 225px');
             //min-height: 50px;
@@ -4285,6 +4286,7 @@ export default {
           }
 
           .modular-content-p-flies {
+            line-height: 32px;
             //position: relative;
             display: inline-block;
             width: calc(~'100% - 225px');

From 0c0e7cc8392c98d75fe579b153e105729fd793dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 1 Apr 2022 16:16:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?52240=20=E5=9B=BD=E5=86=85=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=8A=8A=E5=85=89=E6=A0=87=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E7=9A=84=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=86=85=EF=BC=8C=E5=85=88=E8=BE=93=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E5=AD=971=20=EF=BC=8C=E5=B0=B1=E6=97=A0=E6=B3=95=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E7=BB=A7=E7=BB=AD=E8=BE=93=E5=85=A5=E4=BA=86=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=8F=AF=E4=BB=A5=E8=A7=A3=E5=86=B3=E5=90=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/processDetail/index.vue             |  2 +-
 .../domesticStandardsAndRegulations/index.vue | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 3eb928073..d525ffd1f 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -24,7 +24,7 @@
           class="common-button-default"
           round
           @click="seeProcessLast"
-      >查看流12程数据</el-button>
+      >查看流程数据</el-button>
       <el-button
           v-if="tzclrEnable"
           class="common-button-default"
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 73b1d4b6f..ed735f70c 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -828,17 +828,18 @@
                     >
                       <template slot="label">起草单位</template>
                       <div style="display: flex;justify-content: space-between;align-items: center;">
-                        <el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
-                          <el-input
-                            :config="field"
-                            clearable
-                            @input="change($event)"
-                            v-model="sarStandardsInfoEO['QCDW']"
-                            :disabled="formdisableflag" placeholder="选择或输入起草单位">
-                          </el-input>
-                        </el-tooltip>
-                        <div v-else>
+<!--                        <el-tooltip v-if="sarStandardsInfoEO['QCDW']" :class="sarStandardsInfoEO['QCDW'] ? 'item' : ''" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">-->
+<!--                          <el-input-->
+<!--                            :config="field"-->
+<!--                            clearable-->
+<!--                            @input="change($event)"-->
+<!--                            v-model="sarStandardsInfoEO['QCDW']"-->
+<!--                            :disabled="formdisableflag" placeholder="选择或输入起草单位">-->
+<!--                          </el-input>-->
+<!--                        </el-tooltip>-->
+                        <div>
                           <el-input
+                            :title="sarStandardsInfoEO['QCDW']"
                             :config="field"
                             clearable
                             @input="change($event)"

From 71e43dc947a079fe5604387c683fe1af17b94032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 1 Apr 2022 16:52:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?52373=20=E6=B5=B7=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=9A=E6=9F=A5=E7=9C=8B=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=91=E5=B8=83=E7=A8=BF=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=B2=A1=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 882372bb5..c0fc9787b 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -253,7 +253,7 @@
                         </template>
                       </div>
                       <p class="half">
-                        <label style=" margin-right: 150px;"
+                        <label style=" margin-right: 100px;"
                                title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                         >文本状态</label>
                         <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>