Merge branch 'dev'

@@ -154,7 +154,8 @@
 .iconName {
 .iconName {
   line-height: 24px;
   line-height: 24px;
   font-size: 12px;
   font-size: 12px;
-  white-space: nowrap;
+  width: 100px;
+  // white-space: nowrap;
 }
 }
 
 
 .container {
 .container {
@@ -232,4 +233,4 @@
   position: absolute;
   position: absolute;
   left: 0;
   left: 0;
   bottom: 0;
   bottom: 0;
-}
\ No newline at end of file
+}

@@ -129,6 +129,7 @@
         this.loading = true
         this.loading = true
         if (this.selectList.length == 0) {
         if (this.selectList.length == 0) {
           this.$message.error('请先选择材料目录')
           this.$message.error('请先选择材料目录')
+          this.loading = false
           return
           return
         }
         }
         getPrintTemplateByCode({ tmpno: 'bdcdjbccltts' }).then(res => {
         getPrintTemplateByCode({ tmpno: 'bdcdjbccltts' }).then(res => {

@@ -152,9 +152,11 @@
 }
 }
 
 
 .iconName {
 .iconName {
-  line-height: 24px;
+  text-align: center;
+  line-height: 15px;
   font-size: 12px;
   font-size: 12px;
-  white-space: nowrap;
+  width: 70px;
+  // white-space: nowrap;
 }
 }
 
 
 .container {
 .container {
@@ -242,4 +244,4 @@
   position: absolute;
   position: absolute;
   left: 0;
   left: 0;
   bottom: 0;
   bottom: 0;
-}
\ No newline at end of file
+}