Merge remote-tracking branch 'origin/develop' into develop

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{

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;"
@@ -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>
@@ -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');

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"

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)"

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