From 93373bb1431fe3ee68ec656e48e9fc3c2c5b56a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 22 Mar 2022 17:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 44 +++++++++----------
 .../pages/creatProcess/qbzxdlx/step1.vue      |  8 +++-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 4ee244b6a..2126cf2e5 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -69,27 +69,28 @@
                         <label style="margin-right: 164px;">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
-                          <div v-for="(file, fileIndex) in child1Func(child.value)" style="position: relative;display: flex;">
+                          <div style="position: relative;">
+                            <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;"
-                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                                :title="file.oldFileName">{{ file.oldFileName }}</a>
+                               @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'"
-                          />
+                              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'"
-                          />
+                              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">
+                              <!--                          多个文件时-->
+                              <div v-else-if="child.value && child.value.length > 0">
                             <span style="margin-left: 19%;display: flex; align-items: center;">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
@@ -107,16 +108,15 @@
                                 v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                               />
                             </span>
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </div>
-                          <el-button
-                              v-if="child.attrField === itemNam"
-                              v-for="(itemNam,index) in itemExistList"
-                              :key="index"
+                                <!--                      <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>
+                            </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);"-->
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 0d0a4635a..f9e89382e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -104,6 +104,7 @@
         <el-timeline>
           <el-form
             ref="roleForm"
+            :rules="roleFormRules"
             :model="roleForm"
             class="label-input-form">
             <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -419,6 +420,11 @@ export default {
         dockUser: '',
         dockUserName: '',
       },
+      roleFormRules:{
+        dockUserName: [
+          {required: true, message: '请选择责任工程师', trigger: 'change'},
+        ],
+      },
       // 上传路径
       uploadPath: 'api/att/attFile/upload',
       acceptShow: false,
@@ -977,7 +983,7 @@ export default {
                 }
                 if (finishCount === jsonData.length) {
                   this.isSubmit = false
-                  this.$router.push("/processCenter");
+                  this.$router.push('/processCenter')
                 }
                 this.isSubmit = false
               } else {