From c0adb1d338c025ae3306ae8c382c779f37baef20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 31 Mar 2022 17:47:58 +0800
Subject: [PATCH 1/4] commit

---
 src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index 597c94aa6..dca7aaf9d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -538,7 +538,6 @@
       </div>
     </el-drawer>
     <ProcessFooter
-      show-back
       show-transfer
       show-submit
       :transfer-loading="isTransfer"

From 636ccb323e53d195965c6f056141dfa3c215b883 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Fri, 1 Apr 2022 09:42:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052347=20=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=20=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=20UI=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index d5f3667c4..0f80ed8ac 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -352,7 +352,7 @@
                 <div class="details-content-modular basic-information" style="margin-bottom: 0">
                   <div class="basic-information-content">
                     <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-                    <template v-for="(child, childIndex) in item.child1">
+                    <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
                       <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
                         <label style="float: left;min-height: 43px;line-height: 43px;">{{ child.attrName }}</label>
                         <template style="margin-left: 220px;">

From 74315aaf690756093e6a42e41f436f166bcd5480 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 09:43:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?52326=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E9=99=90=E5=88=B6=E4=B8=BA8=E4=B8=AA=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=9F=E5=9B=BD=E5=86=85=E5=BA=93=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 6 ++++++
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 94a2cc0be..68f61c1c4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1059,6 +1059,8 @@
       <el-upload
         multiple
         drag
+        :limit="8"
+        :on-exceed="handleExceed"
         :file-list="fileList"
         :action="fileUrl"
         ref="importfile"
@@ -1921,6 +1923,10 @@ export default {
     // },
   },
   methods: {
+    //限制上传文件个数
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
     // 标准来源改变事件
     standInChange(val) {
       this.verifySarStandard = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 7efec8e8c..5c11c4174 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1375,6 +1375,8 @@
       <el-upload
         multiple
         drag
+        :limit="8"
+        :on-exceed="handleExceed"
         :file-list="fileList"
         :action="fileUrl"
         ref="importfile"
@@ -1837,6 +1839,10 @@ export default {
     },
   },
   methods: {
+    //限制上传文件个数
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
     // 标准来源改变事件
     standInChange(val) {
       this.verifySarStandard = false

From 7ada2b1d917a542a09a5276f2f8c95928a94a616 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Fri, 1 Apr 2022 09:51:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E4=BF=AE=E6=94=B9b?=
 =?UTF-8?q?ug=2052347=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E5=BA=93=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=20UI=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 0f80ed8ac..3b9c7051f 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -352,69 +352,69 @@
                 <div class="details-content-modular basic-information" style="margin-bottom: 0">
                   <div class="basic-information-content">
                     <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-                    <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
-                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
-                        <label style="float: left;min-height: 43px;line-height: 43px;">{{ child.attrName }}</label>
+                    <p><template v-for="(child, childIndex) in item.child1" >
+                      <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;">
                             <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">
+                              <!--                          单个文件-->
+                              <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
                             <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="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                             />
                             <i
-                                    title="下载带水印"
-                                    v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
-                                    @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                    class="icon-download2"
-                                    v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
+                              title="下载带水印"
+                              v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                             />
-                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                                <!--                      <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: 50px;">
                             <span>
                               <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="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                title="下载"
+                                @click="downloadFile(file.id)"
+                                class="icon-download"
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                               />
                               <i
-                                      title="下载带水印"
-                                      @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                      class="icon-download2"
-                                      v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
+                                title="下载带水印"
+                                @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                class="icon-download2"
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                               />
                             </span>
-                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</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"-->
+                              <!--                                @click="showItemsModel(child.attrField)"-->
+                              <!--                                class="decomposition-btn"-->
+                              <!--                                style="right:62px"-->
+                              <!--                                icon="icon-separate"-->
+                              <!--                        >标准分解单-->
+                              <!--                        </el-button>-->
+                              <!--                          <el-button v-if="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>-->
                             </div>
-                            <!--                        <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"-->
-                            <!--                                icon="icon-separate"-->
-                            <!--                        >标准分解单-->
-                            <!--                        </el-button>-->
-                            <!--                          <el-button v-if="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>-->
-                          </div>
                           </div>
                         </template>
                         <template v-if="child.value === null" >-</template>
                       </div>
-                    </template>
+                    </template></p>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                     <p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
                     <p class="half">