From e4b39d774be661a5c3fe84690a95c5c6a843b831 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Sun, 17 Jul 2022 22:58:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B0=86=E8=AF=91=E6=96=87=E5=AD=97=E6=AE=B5=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 3f2d720ad..8b0537d45 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -949,6 +949,15 @@
                         @fileSuccess="fileSuccess"
                       ></custom-file>
                     </template>
+                    <template v-else-if="field.attrType === 'FILE' && field.attrField === 'FBGYWBD'">
+                      <custom-file
+                          :config="field"
+                          v-model="sarStandardsInfoEO[field.attrField]"
+                          :disabled="formdisableflag"
+                          :show-modify-name="true"
+                          @fileSuccess="fileSuccess"
+                      ></custom-file>
+                    </template>
                   </template>
                 </template>
                 <el-form-item label="标准年份" prop="standYear" label-width="150px" class="add-form-item">
@@ -1187,7 +1196,7 @@
                   ></custom-date-pick>
                 </template>
                 <!--                发布稿的组件 -->
-                <template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD'">
+                <template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD' && field.attrField !== 'FBGYWBD' ">
                   <custom-file
 
                     :config="field"

From 6e8f2d9007e4ff1f179b63db26a48288919c3e98 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Mon, 18 Jul 2022 00:01:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E8=AF=91=E6=96=87=E5=AD=97=E6=AE=B5=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 485 +++++++++---------
 1 file changed, 234 insertions(+), 251 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 70e45f5a8..9b1f3d015 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3,12 +3,12 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
-          sarStandardsInfoEO.standNumber
-        }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
-      <span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
-          sarStandardsInfoEO.standNumber
-        }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>
+      <span v-if="sarStandardsInfoEO.standYear === null">
+        {{ sarStandardsInfoEO.standSortShow || '' }} {{sarStandardsInfoEO.standNumber }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》
+      </span>
+      <span v-else>
+        {{ sarStandardsInfoEO.standSortShow || '' }} {{sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》
+      </span>
     </div>
     <!--主体内容-->
     <div class="details-content" style="position: relative">
@@ -21,8 +21,7 @@
         v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
-          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
-               style="border-top:none;position: absolute;right: 36px;">
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information" style="border-top:none;position: absolute;right: 36px;">
             <div class="modular-header" style="height: 50px;">
               <div class="modular-header-btn">
                 <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
@@ -31,7 +30,6 @@
                            :loading="isSubmit"></el-button>
                 <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
                             <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
-                <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
               </div>
             </div>
           </div>
@@ -48,7 +46,6 @@
               <template v-if="item.label === '基础信息'">
                 <div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;">
                   <div class="basic-information-content">
-                    <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                     <p class="">
                       <label style=" margin-right: 164px;">标准号</label>
                       <span v-if="sarStandardsInfoEO.standYear">{{
@@ -56,85 +53,19 @@
                         }}</span>
                       <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                     </p>
-                    <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
-                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{
-                        sarStandardsInfoEO.standName || '-'
-                      }}</span></p>
-                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
-                        sarStandardsInfoEO.standEnName || '-'
-                      }}</span></p>
+                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{sarStandardsInfoEO.standName || '-' }}</span></p>
+                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{sarStandardsInfoEO.standEnName || '-' }}</span></p>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
                       <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
                         <label style="float: left">{{ child.attrName }}</label>
-                        <template v-if="child.value && child.value.length > 0">
-                          <!--                          单个文件时-->
+                        <template v-if="child.value && child.value.length > 0" >
                           <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;display: inline-block"
-                               @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                               :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                            <i
-                              title="下载"
-                              @click="downloadFile(file.id)"
-                              class="icon-download"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                            />
-                            <i
-                              title="下载带水印"
-                              @click="downloadFileByWater(file.id, file.fileSuffix)"
-                              class="icon-download2"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                            />
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </span>
-                              <!--                          多个文件时-->
-                              <div v-else-if="child.value && child.value.length > 0">
-                            <span style="display: flex; align-items: center;">
-                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                                 @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                                 :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                              <i
-                                title="下载"
-                                @click="downloadFile(file.id)"
-                                class="icon-download"
-                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                              />
-                              <i
-                                title="下载带水印"
-                                @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                class="icon-download2"
-                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                              />
-                            </span>
-                                <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                              </div>
-                            </div>
-                            <el-button
-                              v-if="child.attrField === 'FBGBJBD'"
-                              @click="showItemsModel(child.attrField)"
-                              class="decomposition-btn"
-                            >标准分解单
-                            </el-button>
-                          </div>
-                          <!--                          <el-button v-if="child.value && child.value.length > 1"-->
-                          <!--                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                          <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
-                          <!--                            更多-->
-                          <!--                          </el-button>-->
-                        </template>
-                        <template v-else-if="child.value === null">-</template>
-                        <!--修订本-->
-                        <template v-for="(child, childIndex) in item.child5">
-                          <p class="files-title">
-                            <label style=" margin-right: 164px;">{{ child.attrName }}</label>
-                            <template v-if="child.value && child.value.length > 0"
-                                      v-for="(file, fileIndex) in child5Func(child.value)">
-                              <span>
-                                <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                                   @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                                   :title="file.oldFileName">{{ file.oldFileName }}</a>
+                              <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;display: inline-block"
+                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                                 <i
                                   title="下载"
                                   @click="downloadFile(file.id)"
@@ -147,153 +78,209 @@
                                   class="icon-download2"
                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                                 />
-                                  <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                              </span>
+                              <!--多个文件时-->
+                              <div v-else-if="child.value && child.value.length > 0">
+                                <span style="display: flex; align-items: center;">
+                                  <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                    @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                    :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"
+                                    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                  />
+                                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
+                                    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                  />
                                 </span>
-                              <el-button
-                                v-if="child.attrField === itemNam "
-                                v-for="(itemNam,index) in itemExistList"
-                                :key="index"
-                                @click="showItemsModel(child.attrField)"
-                                class="decomposition-btn"
-                                style="right:62px"
-                              >标准分解单
-                              </el-button>
-                              <el-button v-if="child.value && child.value.length > 1"
-                                         style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
-                                         class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
-                                更多
-                              </el-button>
-                            </template>
-                            <template v-if="child.value === null">-</template>
-                          </p>
-                        </template>
-                        <!--勘误件-->
-                        <template v-for="(child, childIndex) in item.child4">
-                          <p class="files-title">
-                            <label style=" margin-right: 164px;">{{ child.attrName }}</label>
-                            <template v-if="child.value && child.value.length > 0"
-                                      v-for="(file, fileIndex) in child4Func(child.value)">
-                          <span>
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
-                          <i
-                            title="下载"
-                            @click="downloadFile(file.id)"
-                            class="icon-download"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                          />
-                          <i
-                            title="下载带水印"
-                            @click="downloadFileByWater(file.id, file.fileSuffix)"
-                            class="icon-download2"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                          />
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </span>
-                              <el-button
-                                v-if="child.attrField === itemNam "
-                                v-for="(itemNam,index) in itemExistList"
-                                :key="index"
-                                @click="showItemsModel(child.attrField)"
-                                class="decomposition-btn"
-                                style="right:62px"
-                              >标准分解单
-                              </el-button>
-                              <el-button v-if="child.value && child.value.length > 1"
-                                         style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
-                                         class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
-                                更多
-                              </el-button>
-                            </template>
-                            <template v-if="child.value === null">-</template>
-                          </p>
-                        </template>
-                        <!--增补件（必读）-->
-                        <template v-for="(child, childIndex) in item.child3">
-                          <p class="files-title">
-                            <label style=" margin-right: 164px;">{{ child.attrName }}</label>
-                            <template v-if="child.value && child.value.length > 0"
-                                      v-for="(file, fileIndex) in child3Func(child.value)">
-                          <span>
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
-                          <i
-                            title="下载"
-                            @click="downloadFile(file.id)"
-                            class="icon-download"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                          />
-                          <i
-                            title="下载带水印"
-                            @click="downloadFileByWater(file.id, file.fileSuffix)"
-                            class="icon-download2"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                          />
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </span>
-                              <el-button
-                                v-if="child.attrField === itemNam "
-                                v-for="(itemNam,index) in itemExistList"
-                                :key="index"
-                                @click="showItemsModel(child.attrField)"
-                                class="decomposition-btn"
-                                style="right:62px"
-                              >标准分解单
-                              </el-button>
-                              <el-button v-if="child.value && child.value.length > 1"
-                                         style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
-                                         class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
-                                更多
-                              </el-button>
-                            </template>
-                            <template v-if="child.value === null">-</template>
-                          </p>
+                              </div>
+                            </div>
+                            <el-button v-if="child.attrField === 'FBGBJBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单
+                            </el-button>
+                          </div>
                         </template>
+                        <template v-else-if="child.value === null">-</template>
                       </p>
-
-
-
-
-
-
-                      <p class="half">
-                        <label style=" margin-right: 150px;"
-                               title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                        >文本状态</label>
+                    </template>
+                    <!--发布稿（必读）-->
+                    <template v-for="(child, childIndex) in item.child6" v-if="child.value && child.value.length > 0">
+                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                        <label style="float: left">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0" >
+                          <div style="position: relative;margin-left: 214px; line-height: 32px">
+                            <div v-for="(file, fileIndex) in child6Func(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;display: inline-block"
+                                   @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                   :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                                <i title="下载" @click="downloadFile(file.id)" class="icon-download"
+                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
+                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                              </span>
+                              <!--多个文件时-->
+                              <div v-else-if="child.value && child.value.length > 0">
+                                <span style="display: flex; align-items: center;">
+                                  <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                     :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                                  <i title="下载" @click="downloadFile(file.id)" class="icon-download"
+                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                  />
+                                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2"
+                                     v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                  />
+                                </span>
+                              </div>
+                            </div>
+                            <el-button v-if="child.attrField === 'FBGYWBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单
+                            </el-button>
+                          </div>
+                        </template>
+                        <template v-else-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--修订本-->
+                    <template v-for="(child, childIndex) in item.child5">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child5Func(child.value)">
+                              <span>
+                                <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                   @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                   :title="file.oldFileName">{{ file.oldFileName }}</a>
+                                <i
+                                    title="下载"
+                                    @click="downloadFile(file.id)"
+                                    class="icon-download"
+                                    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                    title="下载带水印"
+                                    @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                    class="icon-download2"
+                                    v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                                </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--勘误件-->
+                    <template v-for="(child, childIndex) in item.child4">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child4Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--增补件（必读）-->
+                    <template v-for="(child, childIndex) in item.child3">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child3Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <p class="half">
+                        <label style=" margin-right: 150px;" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
                         <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
-                      </p>
-                      <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
-                          sarStandardsInfoEO.issueTime || '-'
-                        }}</span></p>
-<!--                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
-<!--                          standMap[sarStandardsInfoEO.standNature] || '-'-->
-<!--                        }}</span></p>-->
-                      <!--<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
-                        style=" margin-right: 150px;">标准体系</label><span>{{
-                          sarStandardsInfoEO.standSystem || '-'
-                        }}</span>
-                      </p>-->
-                      <p class="half"><label
-                        style=" margin-right: 150px;">标准体系</label><span>{{
-                          sarStandardsInfoEO.standSystem || '-'
-                        }}</span>
-                      </p>
-                      <p class="half">
-                        <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
-                          sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
-                        }}</span>
-                      </p>
-                      <template v-for="(child, childIndex) in item.child2">
-                        <p class="half">
-                          <label style=" margin-right: 150px;">{{ child.attrName }}</label>
-                          <span>{{ child.value || '-' }}</span>
-                        </p>
-                      </template>
-                      <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
-                      <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
-                      <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
+                    </p>
+                    <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{sarStandardsInfoEO.issueTime || '-' }}</span></p>
+
+                    <p class="half"><label style=" margin-right: 150px;">标准体系</label><span>{{sarStandardsInfoEO.standSystem || '-' }}</span></p>
+                    <p class="half">
+                      <label style=" margin-right: 84px;">是否纳入认证清单</label>
+                      <span>
+                        {{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}
+                      </span>
+                    </p>
+                    <template v-for="(child, childIndex) in item.child2">
+                      <p class="half"><label style=" margin-right: 150px;">{{ child.attrName }}</label><span>{{ child.value || '-' }}</span></p>
                     </template>
                     <div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
                       <div class="wrap" @click="handleToggleShowAll(item)">
@@ -304,10 +291,7 @@
                   </div>
                 </div>
               </template>
-              <template
-                v-for="(child, childIndex) in item.half"
-                v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
-              >
+              <template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'">
                 <!--     modular-item half       代替标准编号-->
                 <div
                   :key="child.id"
@@ -536,12 +520,6 @@
                         <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                     </p>
-                    <!--                                <el-button-->
-                    <!--                                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
-                    <!--                                  @click="showItemsModel(child.attrField)"-->
-                    <!--                                  class="decomposition-btn"-->
-                    <!--                                  icon="icon-separate"-->
-                    <!--                                >标准分解单</el-button>-->
                   </div>
                 </div>
               </template>
@@ -551,7 +529,7 @@
               >
                 <!--                增补件（必读）和勘误件不放在过程稿件里了-->
                 <div
-                  v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
+                  v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' "
                   :key="child.id"
                   :class="'modular-item half'"
                 >
@@ -569,14 +547,11 @@
                       v-for="(file, fileIndex) in child.value"
                       :key="fileIndex"
                     >
-                      <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
                       <!--发布稿、增补件单独设置下载权限-->
                       <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
                   || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-                            file.oldFileName | ellipsis
-                          }}</a>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{file.oldFileName | ellipsis }}</a>
                         <i
                           title="下载"
                           @click="downloadFile(file.id)"
@@ -589,17 +564,9 @@
                           class="icon-download2"
                           v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                         />
-                        <!--                    OCR按钮,根据文件名取后缀判断是否出现-->
-
-                        <!--                      <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>-->
-
-
-                        <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                       <template v-else>
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-                            file.oldFileName | ellipsis
-                          }}</a>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{file.oldFileName | ellipsis }}</a>
                         <i
                           title="下载"
                           @click="downloadFile(file.id)"
@@ -612,7 +579,6 @@
                           class="icon-download2"
                           v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                         />
-                        <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                     </p>
                     <el-button
@@ -2167,6 +2133,14 @@ export default {
       }
       return child5
     },
+    child6Func(child6) {
+      const list = []
+      if (child6 && child6.length > 1) {
+        list.push(child6[0])
+        return list
+      }
+      return child6
+    },
     handleChange(val) {
     },
     handleChange1(val) {
@@ -3824,6 +3798,15 @@ export default {
             location['child5'] = childList
 
           }
+          //修订本
+          if (!list[0].child) {
+            location['child6'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'FBGYWBD');
+            location['child6'] = childList
+
+          }
+
         }
         // 动态属性字段-SYRZ 单独添加至基础信息
         const list2 = displayLocation.filter(item => item.label === '适用范围');

From f2f3b01aea1c62d68cb718ceb10f9d63a4108b5f Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Mon, 18 Jul 2022 09:40:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=8C=E5=B0=86=E6=B5=B7=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=9B=BD=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 8ec8655e0..a7a5ef697 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -112,7 +112,7 @@
                 menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
               },
               {
-                title: '海外标准',
+                title: '国外标准',
                 path: '/foreignStandardsAndRegulations',
                 menuId: '18c1e5134ea0cf865e8960b26b81fd8c'
               },

From d4d10752257b760feb38ccee99cf86dd9db9b8ec Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Mon, 18 Jul 2022 11:30:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?add:=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9Eloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/standQA/index.vue  | 5 ++++-
 src/pages/regulatoryRepository/standQA/index2.vue | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index fca85967f..2c970c7ba 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -132,7 +132,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
-    <el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
+    <el-button class="common-button-primary" size="mini" :loading="isSubmit" type="primary" @click="queSubmit">提 交</el-button>
     </span>
   </el-dialog>
   <!--    选择标准抽屉-->
@@ -586,6 +586,7 @@ export default {
       activeName: 'INLAND',
       activeType: 'INLAND',
       activestand: '',
+      isSubmit: false,
       activeQue: '',
       standType: 'INLAND',
       dialogVisible: false,
@@ -1035,6 +1036,7 @@ export default {
     },
     //提交问题
       queSubmit(){
+        this.isSubmit = true
         if(this.standType === 'OTHER'){
           this.questionForm.standardId = this.questionForm.pubQue
           this.questionForm.standardName = this.questionForm.pubQue
@@ -1049,6 +1051,7 @@ export default {
                   _this: this
                 }, res => {
                   this.dialogVisible = false
+                    this.isSubmit = false
                   this.searchBtn()
                 }, e => {
 
diff --git a/src/pages/regulatoryRepository/standQA/index2.vue b/src/pages/regulatoryRepository/standQA/index2.vue
index 1c0fe93f9..98105726e 100644
--- a/src/pages/regulatoryRepository/standQA/index2.vue
+++ b/src/pages/regulatoryRepository/standQA/index2.vue
@@ -320,7 +320,7 @@
     </div>
     <span slot="footer" class="dialog-footer">
     <el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
-    <el-button class="common-button-primary" size="mini" type="primary" @click="queSubmit">提 交</el-button>
+    <el-button class="common-button-primary" :loading="queSubmitLading" size="mini" type="primary" @click="queSubmit">提 交</el-button>
     </span>
   </el-dialog>
   <!--    选择标准抽屉-->
@@ -766,6 +766,7 @@ export default {
           {required: true, message: '请输入问题', trigger: 'blur'},
         ],
       },
+      queSubmitLading: false,
       questionSerach:{
         classification: 'INLAND',
         standardName: '',  //标准名称
@@ -1226,6 +1227,7 @@ export default {
     },
     //提交问题
       queSubmit(){
+      this.queSubmitLading = true
         if(this.standType === 'OTHER'){
           this.questionForm.standardId = this.questionForm.pubQue
           this.questionForm.standardName = this.questionForm.pubQue
@@ -1260,15 +1262,18 @@ export default {
                       this.standSearch2()
                       break
                   }
+                    this.queSubmitLading = false
                   this.queSearch()
                 }, e => {
 
                 })
             }else{
+              this.queSubmitLading = false
               return this.$message.warning('请输入问题')
             }
           })
         }else{
+          this.queSubmitLading = false
           this.$message.warning('请选择至少一条标准')
         }
       },