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

src/pages/details/otherBussStandardDetails/index.vue

@@ -352,8 +352,8 @@
                 <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">
+                    <p><template v-for="(child, childIndex) in item.child1" >
-                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
+                      <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;">
@@ -414,7 +414,7 @@
                         </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">

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

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

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"